Remove Includes

Removed references to include/config.php and include/probe.php and deleted the respective files.

diff --git a/boot.php b/boot.php
index 4458e3d75377ba66fe231618a33797b61da8085d..89a30ce1e3799c892e22df667bdfc8597aa6a2dc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -26,7 +26,6 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Util\Lock;
 
-require_once 'include/config.php';
 require_once 'include/network.php';
 require_once 'include/plugin.php';
 require_once 'include/text.php';

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index d0b1d00679f9c249f6b4e40168cf4e0a38956939..5f9419e83662a0ff14c4573af9f6173cb49adfcf 100644 (file)
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -9,7 +9,6 @@ use Friendica\Core\Pconfig;
 use Friendica\Core\System;
 
 require_once 'include/html2plain.php';
-require_once 'include/probe.php';
 require_once 'include/datetime.php';
 require_once 'include/bbcode.php';
 require_once 'include/Contact.php';

diff --git a/include/config.php b/include/config.php
deleted file mode 100644 (file)
index 1c8b119..0000000
--- a/include/config.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * @file include/config.php
- *
- *  @brief (Deprecated) Arbitrary configuration storage
- * Note:
- * Please do not store booleans - convert to 0/1 integer values
- * The get_?config() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.
- *
- * There are a few places in the code (such as the admin panel) where boolean
- * configurations need to be fixed as of 10/08/2011.
- */
-
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-
-/**
- * @brief (Deprecated) Loads all configuration values of family into a cached storage.
- *
- * Note: This function is deprecated. Use Config::load() instead.
- *
- * @param string $family
- *  The category of the configuration value
- * @return void
- */
-function load_config($family) {
-       return Config::load($family);
-}
-
-/**
- * @brief (Deprecated) Get a particular user's config variable given the category name
- * ($family) and a key.
- *
- * Note: This function is deprecated. Use Config::get() instead.
- *
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to query
- * @param boolean $refresh
- *  If true the config is loaded from the db and not from the cache
- * @return mixed Stored value or false if it does not exist
- */
-function get_config($family, $key, $refresh = false) {
-       $v = Config::get($family, $key, false, $refresh);
-       return $v;
-}
-
-/**
- * @brief (Deprecated) Sets a configuration value for system config
- *
- * Note: This function is deprecated. Use Config::set() instead.
- *
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to set
- * @param string $value
- *  The value to store
- * @return mixed Stored $value or false if the database update failed
- */
-function set_config($family,$key,$value) {
-       return Config::set($family, $key, $value);
-}
-
-/**
- * @brief (Deprecated) Deletes the given key from the system configuration.
- *
- * Note: This function is deprecated. Use Config::delete() instead.
- *
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to delete
- * @return mixed
- */
-function del_config($family,$key) {
-       return Config::delete($family, $key);
-}
-
-/**
- * @brief (Deprecated) Loads all configuration values of a user's config family into a cached storage.
- *
- * Note: This function is deprecated. Use PConfig::load() instead.
- *
- * @param string $uid
- *  The user_id
- * @param string $family
- *  The category of the configuration value
- * @return void
- */
-function load_pconfig($uid,$family) {
-       return PConfig::load($uid, $family);
-}
-
-/**
- * @brief (Deprecated) Get a particular user's config variable given the category name
- * ($family) and a key.
- *
- * Note: This function is deprecated. Use PConfig::get() instead.
- *
- * @param string $uid
- *  The user_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to query
- * @param boolean $refresh
- *  If true the config is loaded from the db and not from the cache
- * @return mixed Stored value or false if it does not exist
- */
-function get_pconfig($uid, $family, $key, $refresh = false) {
-       $v = PConfig::get($uid, $family, $key, false, $refresh);
-       return $v;
-}
-
-/**
- * @brief (Deprecated) Sets a configuration value for a user
- *
- * Note: This function is deprecated. Use PConfig::set() instead.
- *
- * @param string $uid
- *  The user_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to set
- * @param string $value
- *  The value to store
- * @return mixed Stored $value or false
- */
-function set_pconfig($uid,$family,$key,$value) {
-       return PConfig::set($uid, $family, $key, $value);
-}
-
-/**
- * @brief (Deprecated) Deletes the given key from the users's configuration.
- *
- * Note: This function is deprecated. Use PConfig::delete() instead.
- *
- * @param string $uid The user_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to delete
- * @return mixed
- */
-function del_pconfig($uid,$family,$key) {
-       return PConfig::delete($uid, $family, $key);
-}

diff --git a/include/delivery.php b/include/delivery.php
index 059f6276713ea6e16627a502e59719a2e0c2fd7f..97453ae90549ee6d33e15a9b4d2010d607e437a1 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -6,7 +6,6 @@ use Friendica\Core\Config;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
-require_once 'include/probe.php';
 require_once 'include/diaspora.php';
 require_once 'include/ostatus.php';
 require_once 'include/dfrn.php';

diff --git a/include/diaspora.php b/include/diaspora.php
index 846a89ba9ced9a50607f17a567913c9ace789b8d..ea3229527538dab3cd0dd3092e0b3d67ca84ae39 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -17,7 +17,6 @@ use Friendica\Network\Probe;
 
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
-require_once 'include/probe.php';
 require_once 'include/Contact.php';
 require_once 'include/Photo.php';
 require_once 'include/socgraph.php';

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 1eefd1b81ffea49604ac1c7b924671ba719b7291..0a41c28027bddbc559a62433406b32292e1070bf 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -4,7 +4,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
-require_once 'include/probe.php';
 require_once 'include/socgraph.php';
 require_once 'include/datetime.php';
 

diff --git a/include/follow.php b/include/follow.php
index 55ea86f8cd80534515cf08e19801416a83adae45..d602147a4c5af7a854ef648c607c148a5ed0eea5 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -6,7 +6,6 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
-require_once 'include/probe.php';
 require_once 'include/socgraph.php';
 require_once 'include/group.php';
 require_once 'include/salmon.php';

diff --git a/include/gprobe.php b/include/gprobe.php
index f247c5a4d5ebb07190f015e9c95cc985b27a4068..edc124cf89f956851d1076dfaae56ba804dce99f 100644 (file)
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -3,7 +3,6 @@
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
 
-require_once 'include/probe.php';
 require_once 'include/socgraph.php';
 require_once 'include/datetime.php';
 

diff --git a/include/message.php b/include/message.php
index c2678d2f1d4db92c8bc068512e0e1caae5498ce6..0202604b70c352b3133dd6b74119f00ef7a54db8 100644 (file)
--- a/include/message.php
+++ b/include/message.php
@@ -168,8 +168,6 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
        $convid = 0;
        $reply = false;
 
-       require_once 'include/probe.php';
-
        $me = Probe::uri($replyto);
 
        if (! $me['name']) {

diff --git a/include/notifier.php b/include/notifier.php
index 84c959f80d8f221ae94fc14826b964e8a90904e9..317a9ffcad0966ce35b7e7656254d22cffcd8e91 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -7,7 +7,6 @@ use Friendica\Network\Probe;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
-require_once 'include/probe.php';
 require_once 'include/diaspora.php';
 require_once 'include/ostatus.php';
 require_once 'include/salmon.php';

diff --git a/include/ostatus.php b/include/ostatus.php
index 74941f6ef4036e78a77c220ed5d3696c0c264e6d..bafa2ddc5dfee72c039daf5785fa282673e7559f 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -18,7 +18,6 @@ require_once 'mod/share.php';
 require_once 'include/enotify.php';
 require_once 'include/socgraph.php';
 require_once 'include/Photo.php';
-require_once 'include/probe.php';
 require_once 'include/follow.php';
 require_once 'include/api.php';
 require_once 'mod/proxy.php';

diff --git a/include/socgraph.php b/include/socgraph.php
index 8f09b7b01f7212dd3552e9a2f22132d36fbdb78b..e5c612e82722045e117c5386631825f3c1afb7bd 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -14,7 +14,6 @@ use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/datetime.php';
-require_once 'include/probe.php';
 require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
 require_once 'include/Contact.php';

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 654cb1fba92dbc007cf4ba7220660ec7fcc24f10..e4074667435f4e7c7611a9aa3ffb7fe437c32941 100644 (file)
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -6,7 +6,6 @@ use Friendica\Network\Probe;
 function update_gcontact_run(&$argv, &$argc) {
        global $a;
 
-       require_once 'include/probe.php';
        require_once 'include/socgraph.php';
 
        logger('update_gcontact: start');

diff --git a/include/user.php b/include/user.php
index 88bb26cdee2e33cbd7a9cde4c15ae8c09aba4a41..7eb1058dc05655a9a174b460748ab4ae44ddd9e7 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -3,7 +3,6 @@
 use Friendica\Core\Config;
 use Friendica\Core\System;
 
-require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');

diff --git a/mod/contacts.php b/mod/contacts.php
index 216d2451eaaba34941b0ff95a87185490a627e58..66fbedebef74399f9b0fa1a2776841e8c2a78505 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -8,7 +8,6 @@ use Friendica\Network\Probe;
 require_once 'include/Contact.php';
 require_once 'include/socgraph.php';
 require_once 'include/contact_selectors.php';
-require_once 'include/probe.php';
 require_once 'mod/proxy.php';
 require_once 'include/Photo.php';
 

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index cc5a36d69cc06e1ddda4a16ca3098e66a52c0c6f..de48207a64b13da3f1f191f1ef7f9eb6bd04bb0b 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -19,7 +19,6 @@ use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
-require_once 'include/probe.php';
 require_once 'include/group.php';
 
 function dfrn_request_init(App $a) {

diff --git a/mod/probe.php b/mod/probe.php
deleted file mode 100644 (file)
index dfd4792..0000000
--- a/mod/probe.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Network\Probe;
-
-function probe_content(App $a) {
-
-       if (!local_user()) {
-               http_status_exit(403, array("title" => t("Public access denied."),
-                       "description" => t("Only logged in users are permitted to perform a probing.")));
-               killme();
-       }
-
-       $o .= '<h3>Probe Diagnostic</h3>';
-
-       $o .= '<form action="probe" method="get">';
-       $o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] . '" />';
-       $o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
-       $o .= '<br /><br />';
-
-       if (x($_GET, 'addr')) {
-               $addr = trim($_GET['addr']);
-               $res = Probe::uri($addr, "", 0, false);
-               $o .= '<pre>';
-               $o .= str_replace("\n", '<br />', print_r($res, true));
-               $o .= '</pre>';
-       }
-
-       return $o;
-}

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index ea83b08adf6256db6e3c48569c8b0c4424181056..3372d0326117833a680dd4d75a14a2b08791f7c6 100755 (executable)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -3,7 +3,6 @@
 use Friendica\App;
 use Friendica\Core\System;
 
-require_once 'include/probe.php';
 require_once 'include/follow.php';
 
 function repair_ostatus_content(App $a) {

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 8ee96a14c829e1b5e47e6baf1e98736f0d400464..607c17d277d06ffdabea2c2a84401b391302bf61 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -3,7 +3,6 @@
 use Friendica\App;
 use Friendica\Core\System;
 
-require_once 'include/probe.php';
 require_once 'include/follow.php';
 require_once 'include/Contact.php';
 require_once 'include/contact_selectors.php';