Remove require include/*

advancedcontentfilter/advancedcontentfilter.php

@@ -52,10 +52,6 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\ExpressionLanguage;
 
-require_once 'boot.php';
-require_once 'include/conversation.php';
-require_once 'include/dba.php';
-
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 function advancedcontentfilter_install()

curweather/curweather.php

@@ -9,8 +9,6 @@
  *
  */
 
-require_once 'include/text.php';
-
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;

forumdirectory/forumdirectory.php

@@ -20,10 +20,6 @@ use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 function forumdirectory_install()
 {
 	Addon::registerHook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');

fromgplus/fromgplus.php

@@ -23,8 +23,6 @@ use Friendica\Model\Item;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
-require_once 'include/text.php';
-
 function fromgplus_install() {
 	Addon::registerHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
 	Addon::registerHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
@@ -320,8 +318,6 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-	require_once 'include/items.php';
-
 	$post = "";
 	$quote = "";
 	$pagedata = [];

ifttt/ifttt.php

@@ -7,9 +7,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 require_once 'mod/item.php';
-require_once 'include/items.php';
-require_once 'include/text.php';
-
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;

public_server/public_server.php

@@ -58,7 +58,6 @@ function public_server_cron($a, $b)
 {
 	Logger::log("public_server: cron start");
 
-	require_once('include/enotify.php');
 	$r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
 		`account_expires_on` > '%s' AND
 		`expire_notification_sent` <= '%s'",

pumpio/pumpio.php

@@ -30,7 +30,6 @@ use Friendica\Util\XML;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
-require_once 'include/enotify.php';
 require_once "mod/share.php";
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes

statusnet/statusnet.php

@@ -36,8 +36,6 @@
 define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
-require_once 'include/enotify.php';
-
 use CodebirdSN\CodebirdSN;
 use Friendica\App;
 use Friendica\Content\OEmbed;
@@ -827,8 +825,6 @@ function statusnet_fetchtimeline(App $a, $uid)
 	$lastid  = PConfig::get($uid, 'statusnet', 'lastid');
 
 	require_once 'mod/item.php';
-	require_once 'include/items.php';
-
 	//  get the application name for the SN app
 	//  1st try personal config, then system config and fallback to the
 	//  hostname of the node if neither one is set.
@@ -1254,8 +1250,6 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 
 	Logger::log("statusnet_fetchhometimeline: Fetching for user " . $uid, Logger::DEBUG);
 
-	require_once 'include/items.php';
-
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$own_contact = statusnet_fetch_own_contact($a, $uid);
@@ -1441,8 +1435,6 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 
 function statusnet_convertmsg(App $a, $body, $no_tags = false)
 {
-	require_once "include/items.php";
-
 	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
 
 	$URLSearchString = "^\[\]";

testdrive/testdrive.php

@@ -61,8 +61,6 @@ function testdrive_register_account($a,$b) {
 
 
 function testdrive_cron($a,$b) {
-	require_once('include/enotify.php');
-
 	$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and
 		expire_notification_sent = '0000-00-00 00:00:00' ");
 

twitter/twitter.php

@@ -90,11 +90,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/enotify.php';
-require_once 'include/text.php';
-
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
@@ -804,8 +799,6 @@ function twitter_expire(App $a)
 	}
 	DBA::close($r);
 
-	require_once "include/items.php";
-
 	Logger::log('twitter_expire: expire_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
@@ -935,7 +928,6 @@ function twitter_fetchtimeline(App $a, $uid)
 	$has_picture = false;
 
 	require_once 'mod/item.php';
-	require_once 'include/items.php';
 	require_once 'mod/share.php';
 
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
@@ -1663,8 +1655,6 @@ function twitter_fetchhometimeline(App $a, $uid)
 		$application_name = $a->getHostName();
 	}
 
-	require_once 'include/items.php';
-
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 	try {

widgets/widget_like.php

@@ -52,8 +52,6 @@ function like_widget_content(&$a, $conf){
 	$dislikes = $r[0]['c'];
 
 
-	require_once("include/conversation.php");
-
 	$o = "";
 
 #	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );