Merge pull request #3879 from zeroadam/Remove-Includes-#3873
Remove Includes
This commit is contained in:
commit
1ff217cc13
1
boot.php
1
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';
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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);
|
||||
}
|
|
@ -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';
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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']) {
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
<?php
|
||||
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
/**
|
||||
*
|
||||
* PROBE_DIASPORA has a bias towards returning Diaspora information
|
||||
* while PROBE_NORMAL has a bias towards dfrn/zot - in the case where
|
||||
* an address (such as a Friendica address) supports more than one type
|
||||
* of network.
|
||||
*
|
||||
*/
|
||||
define('PROBE_NORMAL', 0);
|
||||
define('PROBE_DIASPORA', 1);
|
||||
|
||||
/**
|
||||
* @brief Probes a network address to discover what kind of protocols we need to communicate with it.
|
||||
*
|
||||
* Warning: this function is a bit touchy and there are some subtle dependencies within the logic flow.
|
||||
* Edit with care.
|
||||
*
|
||||
* @deprecated Use Friendica\Network\Probe instead
|
||||
*
|
||||
* @see Friendica\Network\Probe::uri()
|
||||
*
|
||||
* @param string $url Any URI
|
||||
* @param int $mode One of the PROBE_* constants
|
||||
* @return array Same data array returned by Friendica\Network\Probe::uri()
|
||||
*/
|
||||
function probe_url($url, $mode = PROBE_NORMAL) {
|
||||
|
||||
if ($mode == PROBE_DIASPORA) {
|
||||
$network = NETWORK_DIASPORA;
|
||||
} else {
|
||||
$network = '';
|
||||
}
|
||||
|
||||
$data = Probe::uri($url, $network);
|
||||
|
||||
return $data;
|
||||
}
|
|
@ -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';
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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';
|
||||
|
|
Loading…
Reference in New Issue
Block a user