nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove include/ requires that are now done directly from Composer

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-24 09:56:25 -05:00
parent 35a6e33e0d
commit acaee626f5
122 changed files with 0 additions and 312 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/auth_ejabberd.php
View file

@ -50,7 +50,6 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
chdir($directory); chdir($directory);
require_once "boot.php"; require_once "boot.php";
require_once "include/dba.php";
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));

1
bin/daemon.php
View file

@ -31,7 +31,6 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
} }
require_once "boot.php"; require_once "boot.php";
require_once "include/dba.php";
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));

2
boot.php
View file

@ -35,8 +35,6 @@ use Friendica\Model\Contact;
use Friendica\Model\Conversation; use Friendica\Model\Conversation;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/text.php';
define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-rc'); define('FRIENDICA_VERSION', '2018.12-rc');

1
include/api.php
View file

@ -46,7 +46,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/conversation.php';
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'mod/item.php'; require_once 'mod/item.php';
require_once 'mod/wall_upload.php'; require_once 'mod/wall_upload.php';

3
include/items.php
View file

@ -24,10 +24,7 @@ use Friendica\Util\ParseUrl;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
require_once 'include/text.php';
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'include/enotify.php';
function add_page_info_data(array $data, $no_photos = false) function add_page_info_data(array $data, $no_photos = false)
{ {
Addon::callHooks('page_info_data', $data); Addon::callHooks('page_info_data', $data);

2
include/text.php
View file

@ -30,8 +30,6 @@ use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
require_once "include/conversation.php";
/** /**
* Turn user/group ACLs stored as angle bracketed text into arrays * Turn user/group ACLs stored as angle bracketed text into arrays
* *

2
mod/acl.php
View file

@ -14,8 +14,6 @@ use Friendica\Model\Item;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/dba.php';
function acl_content(App $a) function acl_content(App $a)
{ {
if (!local_user()) { if (!local_user()) {

4
mod/admin.php
View file

@ -33,10 +33,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
require_once 'include/enotify.php';
require_once 'include/text.php';
require_once 'include/items.php';
/** /**
* @brief Process send data from the admin panels subpages * @brief Process send data from the admin panels subpages
* *

2
mod/allfriends.php
View file

@ -15,8 +15,6 @@ use Friendica\Module;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
require_once 'include/dba.php';
function allfriends_content(App $a) function allfriends_content(App $a)
{ {
$o = ''; $o = '';

2
mod/attach.php
View file

@ -8,8 +8,6 @@ use Friendica\Core\L10n;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\Security; use Friendica\Util\Security;
require_once 'include/dba.php';
function attach_init(App $a) function attach_init(App $a)
{ {
if ($a->argc != 2) { if ($a->argc != 2) {

3
mod/bookmarklet.php
View file

@ -11,9 +11,6 @@ use Friendica\Core\System;
use Friendica\Module\Login; use Friendica\Module\Login;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/conversation.php';
require_once 'include/items.php';
function bookmarklet_init() function bookmarklet_init()
{ {
$_GET["mode"] = "minimal"; $_GET["mode"] = "minimal";

2
mod/common.php
View file

@ -14,8 +14,6 @@ use Friendica\Module;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/dba.php';
function common_content(App $a) function common_content(App $a)
{ {
$o = ''; $o = '';

2
mod/community.php
View file

@ -93,8 +93,6 @@ function community_content(App $a, $update = 0)
} }
} }
require_once 'include/conversation.php';
if (!$update) { if (!$update) {
$tabs = []; $tabs = [];

3
mod/dfrn_confirm.php
View file

@ -36,9 +36,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/enotify.php';
require_once 'include/items.php';
function dfrn_confirm_post(App $a, $handsfree = null) function dfrn_confirm_post(App $a, $handsfree = null)
{ {
$node = null; $node = null;

2
mod/dfrn_notify.php
View file

@ -16,8 +16,6 @@ use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/items.php';
function dfrn_notify_post(App $a) { function dfrn_notify_post(App $a) {
Logger::log(__function__, Logger::TRACE); Logger::log(__function__, Logger::TRACE);

2
mod/dfrn_poll.php
View file

@ -17,8 +17,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/items.php';
function dfrn_poll_init(App $a) function dfrn_poll_init(App $a)
{ {
Login::sessionAuth(); Login::sessionAuth();

2
mod/dfrn_request.php
View file

@ -30,8 +30,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/enotify.php';
function dfrn_request_init(App $a) function dfrn_request_init(App $a)
{ {
if ($a->argc > 1) { if ($a->argc > 1) {

2
mod/display.php
View file

@ -214,8 +214,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
return; return;
} }
require_once 'include/conversation.php';
$o = ''; $o = '';
if ($update) { if ($update) {

2
mod/events.php
View file

@ -22,8 +22,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
require_once 'include/items.php';
function events_init(App $a) function events_init(App $a)
{ {
if (!local_user()) { if (!local_user()) {

4
mod/feedtest.php
View file

@ -12,10 +12,6 @@ use Friendica\Model\Contact;
use Friendica\Protocol\Feed; use Friendica\Protocol\Feed;
use Friendica\Util\Network; use Friendica\Util\Network;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
function feedtest_content(App $a) function feedtest_content(App $a)
{ {
if (!local_user()) { if (!local_user()) {

2
mod/filer.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Renderer;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/items.php';
function filer_content(App $a) function filer_content(App $a)
{ {
if (! local_user()) { if (! local_user()) {

5
mod/item.php
View file

@ -38,10 +38,6 @@ use Friendica\Util\Emailer;
use Friendica\Util\Security; use Friendica\Util\Security;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/enotify.php';
require_once 'include/text.php';
require_once 'include/items.php';
function item_post(App $a) { function item_post(App $a) {
if (!local_user() && !remote_user()) { if (!local_user() && !remote_user()) {
return 0; return 0;
@ -668,7 +664,6 @@ function item_post(App $a) {
// preview mode - prepare the body for display and send it via json // preview mode - prepare the body for display and send it via json
if ($preview) { if ($preview) {
require_once 'include/conversation.php';
// We set the datarray ID to -1 because in preview mode the dataray // We set the datarray ID to -1 because in preview mode the dataray
// doesn't have an ID. // doesn't have an ID.
$datarray["id"] = -1; $datarray["id"] = -1;

2
mod/like.php
View file

@ -5,8 +5,6 @@ use Friendica\Core\System;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/items.php';
function like_content(App $a) { function like_content(App $a) {
if (!local_user() && !remote_user()) { if (!local_user() && !remote_user()) {
return false; return false;

4
mod/lostpass.php
View file

@ -13,10 +13,6 @@ use Friendica\Model\User;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'boot.php';
require_once 'include/enotify.php';
require_once 'include/text.php';
function lostpass_post(App $a) function lostpass_post(App $a)
{ {
$loginame = Strings::escapeTags(trim($_POST['login-name'])); $loginame = Strings::escapeTags(trim($_POST['login-name']));

2
mod/manage.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once "include/text.php";
function manage_post(App $a) { function manage_post(App $a) {
if (! local_user()) { if (! local_user()) {

2
mod/message.php
View file

@ -21,8 +21,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
require_once 'include/conversation.php';
function message_init(App $a) function message_init(App $a)
{ {
$tabs = ''; $tabs = '';

3
mod/network.php
View file

@ -30,9 +30,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/conversation.php';
require_once 'include/items.php';
function network_init(App $a) function network_init(App $a)
{ {
if (!local_user()) { if (!local_user()) {

2
mod/nodeinfo.php
View file

@ -12,8 +12,6 @@ use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\Network; use Friendica\Util\Network;
require_once 'include/dba.php';
function nodeinfo_wellknown(App $a) { function nodeinfo_wellknown(App $a) {
$nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0', $nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
'href' => System::baseUrl().'/nodeinfo/1.0']]]; 'href' => System::baseUrl().'/nodeinfo/1.0']]];

2
mod/notes.php
View file

@ -34,8 +34,6 @@ function notes_content(App $a, $update = false)
return; return;
} }
require_once 'include/conversation.php';
$o = Profile::getTabs($a, true); $o = Profile::getTabs($a, true);
if (!$update) { if (!$update) {

2
mod/parse_url.php
View file

@ -15,8 +15,6 @@ use Friendica\Core\Logger;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\ParseUrl; use Friendica\Util\ParseUrl;
require_once 'include/items.php';
function parse_url_content(App $a) function parse_url_content(App $a)
{ {
$text = null; $text = null;

4
mod/photos.php
View file

@ -34,8 +34,6 @@ use Friendica\Util\Temporal;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/items.php';
function photos_init(App $a) { function photos_init(App $a) {
if ($a->argc > 1) { if ($a->argc > 1) {
@ -946,8 +944,6 @@ function photos_content(App $a)
return; return;
} }
require_once 'include/conversation.php';
if (empty($a->data['user'])) { if (empty($a->data['user'])) {
notice(L10n::t('No photos selected') . EOL); notice(L10n::t('No photos selected') . EOL);
return; return;

2
mod/phpinfo.php
View file

@ -3,8 +3,6 @@
* @file mod/phpinfo.php * @file mod/phpinfo.php
*/ */
require_once 'boot.php';
function phpinfo_content() function phpinfo_content()
{ {
if (!is_site_admin()) { if (!is_site_admin()) {

2
mod/ping.php
View file

@ -22,8 +22,6 @@ use Friendica\Util\Temporal;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/enotify.php';
/** /**
* @brief Outputs the counts and the lists of various notifications * @brief Outputs the counts and the lists of various notifications
* *

2
mod/poke.php
View file

@ -25,8 +25,6 @@ use Friendica\Model\Item;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/items.php';
function poke_init(App $a) function poke_init(App $a)
{ {
if (!local_user()) { if (!local_user()) {

3
mod/profile.php
View file

@ -135,9 +135,6 @@ function profile_content(App $a, $update = 0)
return Login::form(); return Login::form();
} }
require_once 'include/conversation.php';
require_once 'include/items.php';
$groups = []; $groups = [];
$remote_cid = null; $remote_cid = null;

2
mod/pubsub.php
View file

@ -9,8 +9,6 @@ use Friendica\Protocol\OStatus;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Core\System; use Friendica\Core\System;
require_once 'include/items.php';
function hub_return($valid, $body) function hub_return($valid, $body)
{ {
if ($valid) { if ($valid) {

2
mod/register.php
View file

@ -18,8 +18,6 @@ use Friendica\Model;
use Friendica\Module\Tos; use Friendica\Module\Tos;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/enotify.php';
function register_post(App $a) function register_post(App $a)
{ {
BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register'); BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');

2
mod/regmod.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\Register;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Login; use Friendica\Module\Login;
require_once 'include/enotify.php';
function user_allow($hash) function user_allow($hash)
{ {
$a = get_app(); $a = get_app();

2
mod/removeme.php
View file

@ -12,8 +12,6 @@ use Friendica\Database\DBA;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/enotify.php';
function removeme_post(App $a) function removeme_post(App $a)
{ {
if (!local_user()) { if (!local_user()) {

2
mod/salmon.php
View file

@ -14,8 +14,6 @@ use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/items.php';
function salmon_post(App $a, $xml = '') { function salmon_post(App $a, $xml = '') {
if (empty($xml)) { if (empty($xml)) {

1
mod/search.php
View file

@ -18,7 +18,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/conversation.php';
require_once 'mod/dirfind.php'; require_once 'mod/dirfind.php';
function search_saved_searches() { function search_saved_searches() {

2
mod/subthread.php
View file

@ -13,8 +13,6 @@ use Friendica\Util\Security;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/items.php';
function subthread_content(App $a) { function subthread_content(App $a) {
if (!local_user() && !remote_user()) { if (!local_user() && !remote_user()) {

2
mod/tagger.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\Item;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/items.php';
function tagger_content(App $a) { function tagger_content(App $a) {
if (!local_user() && !remote_user()) { if (!local_user() && !remote_user()) {

4
mod/videos.php
View file

@ -18,8 +18,6 @@ use Friendica\Model\Profile;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Util\Security; use Friendica\Util\Security;
require_once 'include/items.php';
function videos_init(App $a) function videos_init(App $a)
{ {
if ($a->argc > 1) { if ($a->argc > 1) {
@ -195,8 +193,6 @@ function videos_content(App $a)
return; return;
} }
require_once 'include/conversation.php';
if (empty($a->data['user'])) { if (empty($a->data['user'])) {
notice(L10n::t('No videos selected') . EOL ); notice(L10n::t('No videos selected') . EOL );
return; return;

3
src/App.php
View file

@ -11,9 +11,6 @@ use Exception;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
require_once 'boot.php';
require_once 'include/text.php';
/** /**
* *
* class: App * class: App

2
src/BaseObject.php
View file

@ -4,8 +4,6 @@
*/ */
namespace Friendica; namespace Friendica;
require_once 'boot.php';
/** /**
* Basic object * Basic object
* *

2
src/Content/ForumManager.php
View file

@ -15,8 +15,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
require_once 'include/dba.php';
/** /**
* @brief This class handles methods related to the forum functionality * @brief This class handles methods related to the forum functionality
*/ */

3
src/Content/Nav.php
View file

@ -15,9 +15,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile; use Friendica\Model\Profile;
require_once 'boot.php';
require_once 'include/text.php';
class Nav class Nav
{ {
private static $selected = [ private static $selected = [

2
src/Content/OEmbed.php
View file

@ -23,8 +23,6 @@ use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/dba.php';
/** /**
* Handles all OEmbed content fetching and replacement * Handles all OEmbed content fetching and replacement
* *

3
src/Content/Widget.php
View file

@ -21,9 +21,6 @@ use Friendica\Model\Profile;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'boot.php';
require_once 'include/dba.php';
class Widget class Widget
{ {
/** /**

3
src/Content/Widget/CalendarExport.php
View file

@ -10,9 +10,6 @@ use Friendica\Content\Feature;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
require_once 'boot.php';
require_once 'include/text.php';
/** /**
* TagCloud widget * TagCloud widget
* *

2
src/Content/Widget/TagCloud.php
View file

@ -13,8 +13,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Util\Security; use Friendica\Util\Security;
require_once 'include/dba.php';
/** /**
* TagCloud widget * TagCloud widget
* *

2
src/Core/Config.php
View file

@ -12,8 +12,6 @@ use Friendica\App;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once 'include/dba.php';
/** /**
* @brief Arbitrary system configuration storage * @brief Arbitrary system configuration storage
* *

2
src/Core/Config/JITConfigAdapter.php
View file

@ -4,8 +4,6 @@ namespace Friendica\Core\Config;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'include/dba.php';
/** /**
* JustInTime Configuration Adapter * JustInTime Configuration Adapter
* *

2
src/Core/Config/JITPConfigAdapter.php
View file

@ -4,8 +4,6 @@ namespace Friendica\Core\Config;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'include/dba.php';
/** /**
* JustInTime User Configuration Adapter * JustInTime User Configuration Adapter
* *

2
src/Core/Config/PreloadConfigAdapter.php
View file

@ -6,8 +6,6 @@ use Exception;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'include/dba.php';
/** /**
* Preload Configuration Adapter * Preload Configuration Adapter
* *

2
src/Core/Config/PreloadPConfigAdapter.php
View file

@ -6,8 +6,6 @@ use Exception;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'include/dba.php';
/** /**
* Preload User Configuration Adapter * Preload User Configuration Adapter
* *

2
src/Core/Console/AutomaticInstallation.php
View file

@ -11,8 +11,6 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use RuntimeException; use RuntimeException;
require_once 'include/dba.php';
class AutomaticInstallation extends Console class AutomaticInstallation extends Console
{ {
protected function getHelp() protected function getHelp()

3
src/Core/Console/DatabaseStructure.php
View file

@ -8,9 +8,6 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use RuntimeException; use RuntimeException;
require_once 'boot.php';
require_once 'include/dba.php';
/** /**
* @brief Performs database updates from the command line * @brief Performs database updates from the command line
* *

2
src/Core/Console/GlobalCommunitySilence.php
View file

@ -8,8 +8,6 @@ use Friendica\Network\Probe;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use RuntimeException; use RuntimeException;
require_once 'include/text.php';
/** /**
* @brief tool to silence accounts on the global community page * @brief tool to silence accounts on the global community page
* *

3
src/Core/Console/Maintenance.php
View file

@ -4,9 +4,6 @@ namespace Friendica\Core\Console;
use Friendica\Core; use Friendica\Core;
require_once 'boot.php';
require_once 'include/dba.php';
/** /**
* @brief Sets maintenance mode for this node * @brief Sets maintenance mode for this node
* *

1
src/Core/Installer.php
View file

@ -578,7 +578,6 @@ class Installer
*/ */
public function checkDB($dbhost, $dbuser, $dbpass, $dbdata) public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
{ {
require_once 'include/dba.php';
if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) { if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
$this->addCheck(L10n::t('Could not connect to database.'), false, true, ''); $this->addCheck(L10n::t('Could not connect to database.'), false, true, '');

3
src/Core/L10n.php
View file

@ -10,9 +10,6 @@ use Friendica\Core\Addon;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
require_once 'boot.php';
require_once 'include/dba.php';
/** /**
* Provide Language, Translation, and Localization functions to the application * Provide Language, Translation, and Localization functions to the application
* Localization can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N"). * Localization can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").

2
src/Core/NotificationsManager.php
View file

@ -19,8 +19,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/dba.php';
/** /**
* @brief Methods for read and write notifications from/to database * @brief Methods for read and write notifications from/to database
* or for formatting notifications * or for formatting notifications

2
src/Core/PConfig.php
View file

@ -11,8 +11,6 @@ namespace Friendica\Core;
use Friendica\App; use Friendica\App;
use Friendica\BaseObject; use Friendica\BaseObject;
require_once 'include/dba.php';
/** /**
* @brief Management of user configuration storage * @brief Management of user configuration storage
* Note: * Note:

3
src/Core/Session/CacheSessionHandler.php
View file

@ -8,9 +8,6 @@ use Friendica\Core\Logger;
use Friendica\Core\Session; use Friendica\Core\Session;
use SessionHandlerInterface; use SessionHandlerInterface;
require_once 'boot.php';
require_once 'include/text.php';
/** /**
* SessionHandler using Friendica Cache * SessionHandler using Friendica Cache
* *

4
src/Core/Session/DatabaseSessionHandler.php
View file

@ -8,10 +8,6 @@ use Friendica\Core\Session;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use SessionHandlerInterface; use SessionHandlerInterface;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/** /**
* SessionHandler using database * SessionHandler using database
* *

2
src/Core/Theme.php
View file

@ -9,8 +9,6 @@ namespace Friendica\Core;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
require_once 'boot.php';
/** /**
* Some functions to handle themes * Some functions to handle themes
*/ */

2
src/Core/UserImport.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\Photo;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once "include/dba.php";
/** /**
* @brief UserImport class * @brief UserImport class
*/ */

2
src/Core/Worker.php
View file

@ -11,8 +11,6 @@ use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
require_once 'include/dba.php';
/** /**
* @file src/Core/Worker.php * @file src/Core/Worker.php
* *

2
src/Database/DBA.php
View file

@ -16,8 +16,6 @@ use PDO;
use PDOException; use PDOException;
use PDOStatement; use PDOStatement;
require_once 'include/dba.php';
/** /**
* @class MySQL database class * @class MySQL database class
* *

5
src/Database/DBStructure.php
View file

@ -12,11 +12,6 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/enotify.php';
require_once 'include/text.php';
/** /**
* @brief This class contain functions for the database management * @brief This class contain functions for the database management
* *

2
src/Database/PostUpdate.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\ItemURI;
use Friendica\Model\PermissionSet; use Friendica\Model\PermissionSet;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'include/dba.php';
/** /**
* Post update functions * Post update functions
*/ */

2
src/Model/APContact.php
View file

@ -16,8 +16,6 @@ use Friendica\Util\JsonLD;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'boot.php';
class APContact extends BaseObject class APContact extends BaseObject
{ {
/** /**

6
src/Model/Contact.php
View file

@ -27,10 +27,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/** /**
* @brief functions for interacting with a contact * @brief functions for interacting with a contact
*/ */
@ -1376,8 +1372,6 @@ class Contact extends BaseObject
{ {
$a = self::getApp(); $a = self::getApp();
require_once 'include/conversation.php';
$cid = Self::getIdForURL($contact_url); $cid = Self::getIdForURL($contact_url);
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]); $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);

2
src/Model/Conversation.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once "include/dba.php";
class Conversation class Conversation
{ {
/* /*

4
src/Model/Event.php
View file

@ -19,10 +19,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map; use Friendica\Util\Map;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/items.php';
/** /**
* @brief functions for interacting with the event database table * @brief functions for interacting with the event database table
*/ */

2
src/Model/GContact.php
View file

@ -19,8 +19,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/dba.php';
/** /**
* @brief This class handles GlobalContact related functions * @brief This class handles GlobalContact related functions
*/ */

4
src/Model/Group.php
View file

@ -12,10 +12,6 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\Security; use Friendica\Util\Security;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/** /**
* @brief functions for interacting with the group database table * @brief functions for interacting with the group database table
*/ */

4
src/Model/Item.php
View file

@ -36,10 +36,6 @@ use Friendica\Util\Security;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Text_LanguageDetect; use Text_LanguageDetect;
require_once 'boot.php';
require_once 'include/items.php';
require_once 'include/text.php';
class Item extends BaseObject class Item extends BaseObject
{ {
// Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types // Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types

4
src/Model/ItemContent.php
View file

@ -11,10 +11,6 @@ use Friendica\Content\Text;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
require_once 'boot.php';
require_once 'include/items.php';
require_once 'include/text.php';
class ItemContent extends BaseObject class ItemContent extends BaseObject
{ {
/** /**

2
src/Model/ItemURI.php
View file

@ -9,8 +9,6 @@ namespace Friendica\Model;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'boot.php';
class ItemURI extends BaseObject class ItemURI extends BaseObject
{ {
/** /**

2
src/Model/Mail.php
View file

@ -13,8 +13,6 @@ use Friendica\Database\DBA;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
/** /**
* Class to handle private messages * Class to handle private messages
*/ */

2
src/Model/PermissionSet.php
View file

@ -7,8 +7,6 @@ namespace Friendica\Model;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'include/dba.php';
/** /**
* @brief functions for interacting with the permission set of an object (item, photo, event, ...) * @brief functions for interacting with the permission set of an object (item, photo, event, ...)
*/ */

2
src/Model/Photo.php
View file

@ -16,8 +16,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Security; use Friendica\Util\Security;
require_once 'include/dba.php';
/** /**
* Class to handle photo dabatase table * Class to handle photo dabatase table
*/ */

2
src/Model/Process.php
View file

@ -8,8 +8,6 @@ use Friendica\BaseObject;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
/** /**
* @brief functions for interacting with a process * @brief functions for interacting with a process
*/ */

2
src/Model/Profile.php
View file

@ -28,8 +28,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
require_once 'include/dba.php';
class Profile class Profile
{ {
/** /**

2
src/Model/PushSubscriber.php
View file

@ -9,8 +9,6 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
class PushSubscriber class PushSubscriber
{ {
/** /**

2
src/Model/Queue.php
View file

@ -9,8 +9,6 @@ use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
class Queue class Queue
{ {
/** /**

4
src/Model/Term.php
View file

@ -7,10 +7,6 @@ namespace Friendica\Model;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
require_once 'boot.php';
require_once 'include/conversation.php';
require_once 'include/dba.php';
class Term class Term
{ {
public static function tagTextFromItemId($itemid) public static function tagTextFromItemId($itemid)

4
src/Model/User.php
View file

@ -24,10 +24,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use LightOpenID; use LightOpenID;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/enotify.php';
require_once 'include/text.php';
/** /**
* @brief This class handles User related functions * @brief This class handles User related functions
*/ */

3
src/Module/Hashtag.php
View file

@ -9,9 +9,6 @@ use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/dba.php';
require_once 'include/text.php';
/** /**
* Hashtag module. * Hashtag module.
*/ */

3
src/Module/Login.php
View file

@ -20,9 +20,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use LightOpenID; use LightOpenID;
require_once 'boot.php';
require_once 'include/text.php';
/** /**
* Login module * Login module
* *

2
src/Module/Logout.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Authentication;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
require_once 'boot.php';
/** /**
* Logout module * Logout module
* *

2
src/Network/FKOAuthDataStore.php
View file

@ -19,8 +19,6 @@ use OAuthToken;
define('REQUEST_TOKEN_DURATION', 300); define('REQUEST_TOKEN_DURATION', 300);
define('ACCESS_TOKEN_DURATION', 31536000); define('ACCESS_TOKEN_DURATION', 31536000);
require_once 'include/dba.php';
/** /**
* @brief OAuthDataStore class * @brief OAuthDataStore class
*/ */

2
src/Network/Probe.php
View file

@ -28,8 +28,6 @@ use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
use DomXPath; use DomXPath;
require_once 'include/dba.php';
/** /**
* @brief This class contain functions for probing URL * @brief This class contain functions for probing URL
* *

5
src/Object/Post.php
View file

@ -24,11 +24,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
require_once 'include/dba.php';
require_once 'include/text.php';
require_once 'boot.php';
require_once 'include/conversation.php';
/** /**
* An item * An item
*/ */

3
src/Object/Thread.php
View file

@ -10,9 +10,6 @@ use Friendica\Core\Protocol;
use Friendica\Object\Post; use Friendica\Object\Post;
use Friendica\Util\Security; use Friendica\Util\Security;
require_once 'boot.php';
require_once 'include/text.php';
/** /**
* A list of threads * A list of threads
* *

6
src/Protocol/DFRN.php
View file

@ -37,12 +37,6 @@ use Friendica\Util\XML;
use HTMLPurifier; use HTMLPurifier;
use HTMLPurifier_Config; use HTMLPurifier_Config;
require_once 'boot.php';
require_once 'include/dba.php';
require_once "include/enotify.php";
require_once "include/items.php";
require_once "include/text.php";
/** /**
* @brief This class contain functions to create and send DFRN XML files * @brief This class contain functions to create and send DFRN XML files
*/ */

3
src/Protocol/Diaspora.php
View file

@ -38,9 +38,6 @@ use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
use SimpleXMLElement; use SimpleXMLElement;
require_once 'include/dba.php';
require_once 'include/items.php';
/** /**
* @brief This class contain functions to create and send Diaspora XML files * @brief This class contain functions to create and send Diaspora XML files
* *

Some files were not shown because too many files have changed in this diff Show more