Remove require include/*

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index a00f2f070d4214e14127ddb10bb1ed38fed6c2a6..d06dab51316681d34ed29b10a5558decaac8aa82 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/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()

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 9d4d42e747b506c90d9a745408dbd27ab1425329..d1ef63b88b65862862879500e188638f947ab6ac 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -9,8 +9,6 @@
  *
  */
 
-require_once 'include/text.php';
-
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 0e2f0fe30377cf4fe1759c541ccba58f7990b8d6..526a35fe040d52205f7e3cdaa3bcbcc2a052185c 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/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');

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 35f90ac06fdf85f7b0fa28d45a48ea5b276a0c4d..79da93dcd4fed392b14800d2e786b5b02678b62f 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/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 = [];

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 50fa119c9a3a87fce429319b9abd6cbaa8a8cf62..029db9a0171c2c8f961529edee2a71e79ea2648e 100644 (file)
--- a/ifttt/ifttt.php
+++ b/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;

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7e09806effab488d74a9a91aedb742e3a4b799ea..39b3f7fde33c291e673392362a354168eaca9ea2 100644 (file)
--- a/public_server/public_server.php
+++ b/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'",

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index fa0365edafdce70446c629e5f5ae9084255c24ee..c550d9241a16c7cd148055ebf04c4d5c0226a648 100644 (file)
--- a/pumpio/pumpio.php
+++ b/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

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 28920dd670320042c8337bc2ec8605457ac2714e..8c9bee5f7ce99c1a122991f3b351ffb8e29861b9 100644 (file)
--- a/statusnet/statusnet.php
+++ b/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 = "^\[\]";

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 6daf136e19fd09a08970772b613a64b96da833e8..9489c838597af260faa7a42a5614a74f461c26de 100644 (file)
--- a/testdrive/testdrive.php
+++ b/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' ");
 

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 43269a878d4d3e6c48c5bfef95c5cbe90395572d..7f37bcaae8f9edf06bd4a9e7f95fa3efacb7f9a6 100644 (file)
--- a/twitter/twitter.php
+++ b/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 {

diff --git a/widgets/widget_like.php b/widgets/widget_like.php
index 9693d2549794d34da9f6039c5a85cb18c2da16c0..56ad1e5b35abbda726541899d9de8e593e52955d 100644 (file)
--- a/widgets/widget_like.php
+++ b/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" );