From 8522c473538804518ea469d57160171ba3643aae Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Tue, 7 Nov 2017 12:14:03 -0500
Subject: [PATCH] Remove Includes
Removed references to include/config.php and include/probe.php and deleted the respective files.
---
boot.php | 1 -
include/NotificationsManager.php | 1 -
include/config.php | 151 -------------------------------
include/delivery.php | 1 -
include/diaspora.php | 1 -
include/discover_poco.php | 1 -
include/follow.php | 1 -
include/gprobe.php | 1 -
include/message.php | 2 -
include/notifier.php | 1 -
include/ostatus.php | 1 -
include/socgraph.php | 1 -
include/update_gcontact.php | 1 -
include/user.php | 1 -
mod/contacts.php | 1 -
mod/dfrn_request.php | 1 -
mod/probe.php | 31 -------
mod/repair_ostatus.php | 1 -
mod/unfollow.php | 1 -
19 files changed, 200 deletions(-)
delete mode 100644 include/config.php
delete mode 100644 mod/probe.php
diff --git a/boot.php b/boot.php
index 4458e3d753..89a30ce1e3 100644
--- 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 d0b1d00679..5f9419e836 100644
--- 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
index 1c8b119bcc..0000000000
--- 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 059f627671..97453ae905 100644
--- 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 846a89ba9c..ea32295275 100644
--- 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 1eefd1b81f..0a41c28027 100644
--- 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 55ea86f8cd..d602147a4c 100644
--- 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 f247c5a4d5..edc124cf89 100644
--- 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 c2678d2f1d..0202604b70 100644
--- 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 84c959f80d..317a9ffcad 100644
--- 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 74941f6ef4..bafa2ddc5d 100644
--- 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 8f09b7b01f..e5c612e827 100644
--- 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 654cb1fba9..e407466743 100644
--- 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 88bb26cdee..7eb1058dc0 100644
--- 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 216d2451ea..66fbedebef 100644
--- 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 cc5a36d69c..de48207a64 100644
--- 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
index dfd4792c9b..0000000000
--- 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 ea83b08adf..3372d03261 100755
--- 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 8ee96a14c8..607c17d277 100644
--- 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';