From f02029240876703aeaa0dec9e60ff232253ad22c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 3 Feb 2018 12:27:47 -0500 Subject: [PATCH] Remove references to include/datetime --- boot.php | 1 - include/api.php | 1 - include/dba.php | 2 -- include/event.php | 2 -- mod/events.php | 1 - mod/install.php | 1 - mod/localtime.php | 2 -- mod/lostpass.php | 1 - mod/ping.php | 1 - mod/wall_attach.php | 2 -- src/Core/NotificationsManager.php | 1 - src/Model/GContact.php | 1 - src/Model/Mail.php | 1 - src/Model/Process.php | 1 - src/Model/Queue.php | 1 - src/Module/Login.php | 1 - src/Protocol/Diaspora.php | 1 - src/Protocol/PortableContact.php | 1 - src/Worker/Cron.php | 2 -- src/Worker/CronHooks.php | 2 -- src/Worker/CronJobs.php | 1 - src/Worker/Delivery.php | 1 - src/Worker/DiscoverPoCo.php | 2 -- src/Worker/Expire.php | 1 - src/Worker/GProbe.php | 2 -- src/Worker/Notifier.php | 1 - src/Worker/OnePoll.php | 1 - src/Worker/Queue.php | 1 - 28 files changed, 36 deletions(-) diff --git a/boot.php b/boot.php index b3743ab991..004ebf3ade 100644 --- a/boot.php +++ b/boot.php @@ -32,7 +32,6 @@ use Friendica\Model\Contact; use Friendica\Util\DateTimeFormat; require_once 'include/text.php'; -require_once 'include/datetime.php'; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Asparagus'); diff --git a/include/api.php b/include/api.php index 96a935614d..e50bc92a8e 100644 --- a/include/api.php +++ b/include/api.php @@ -41,7 +41,6 @@ use Friendica\Util\Network; use Friendica\Util\XML; require_once 'include/bbcode.php'; -require_once 'include/datetime.php'; require_once 'include/conversation.php'; require_once 'include/html2plain.php'; require_once 'mod/share.php'; diff --git a/include/dba.php b/include/dba.php index f6bab9e3c5..1407c1c6f5 100644 --- a/include/dba.php +++ b/include/dba.php @@ -6,8 +6,6 @@ use Friendica\Database\DBM; use Friendica\Database\DBStructure; use Friendica\Util\DateTimeFormat; -require_once('include/datetime.php'); - /** * @class MySQL database class * diff --git a/include/event.php b/include/event.php index 647697e5a0..30ba1cfde2 100644 --- a/include/event.php +++ b/include/event.php @@ -16,7 +16,6 @@ use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; require_once 'include/bbcode.php'; -require_once 'include/datetime.php'; require_once 'include/conversation.php'; function format_event_html($ev, $simple = false) { @@ -238,7 +237,6 @@ function event_delete($event_id) { */ function event_store($arr) { - require_once 'include/datetime.php'; require_once 'include/items.php'; require_once 'include/bbcode.php'; diff --git a/mod/events.php b/mod/events.php index 2ff97e9fd6..0b8938631f 100644 --- a/mod/events.php +++ b/mod/events.php @@ -16,7 +16,6 @@ use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; require_once 'include/bbcode.php'; -require_once 'include/datetime.php'; require_once 'include/event.php'; require_once 'include/items.php'; diff --git a/mod/install.php b/mod/install.php index 1ddc8fbad1..f3969a6f24 100644 --- a/mod/install.php +++ b/mod/install.php @@ -253,7 +253,6 @@ function install_content(App $a) { return $o; }; break; case 3: { // Site settings - require_once('include/datetime.php'); $dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'); $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); diff --git a/mod/localtime.php b/mod/localtime.php index fd1ef33a95..b10f1571a0 100644 --- a/mod/localtime.php +++ b/mod/localtime.php @@ -9,8 +9,6 @@ use Friendica\Core\System; use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; -require_once 'include/datetime.php'; - function localtime_post(App $a) { $t = $_REQUEST['time']; diff --git a/mod/lostpass.php b/mod/lostpass.php index 75d29731be..73167e6fe0 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -11,7 +11,6 @@ use Friendica\Model\User; use Friendica\Util\DateTimeFormat; require_once 'boot.php'; -require_once 'include/datetime.php'; require_once 'include/enotify.php'; require_once 'include/text.php'; diff --git a/mod/ping.php b/mod/ping.php index 87053395c1..1bb8f147f9 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -18,7 +18,6 @@ use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; use Friendica\Util\XML; -require_once 'include/datetime.php'; require_once 'include/bbcode.php'; require_once 'mod/proxy.php'; require_once 'include/enotify.php'; diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 30bc9641f7..07092cf180 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -10,8 +10,6 @@ use Friendica\Database\DBM; use Friendica\Util\DateTimeFormat; use Friendica\Util\Mimetype; -require_once 'include/datetime.php'; - function wall_attach_post(App $a) { $r_json = (x($_GET,'response') && $_GET['response']=='json'); diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 5cbd567a95..ed12a89141 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -19,7 +19,6 @@ use Friendica\Util\XML; require_once 'include/dba.php'; require_once 'include/html2plain.php'; -require_once 'include/datetime.php'; require_once 'include/bbcode.php'; /** diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 5e75ba5a54..e543e4baeb 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -19,7 +19,6 @@ use Friendica\Util\Network; use dba; use Exception; -require_once 'include/datetime.php'; require_once 'include/dba.php'; require_once 'include/html2bbcode.php'; diff --git a/src/Model/Mail.php b/src/Model/Mail.php index f9b4c4d6db..b2e9e1a487 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -14,7 +14,6 @@ use Friendica\Util\DateTimeFormat; use dba; require_once 'include/dba.php'; -require_once 'include/datetime.php'; /** * Class to handle private messages diff --git a/src/Model/Process.php b/src/Model/Process.php index c360a13d09..75d898065c 100644 --- a/src/Model/Process.php +++ b/src/Model/Process.php @@ -9,7 +9,6 @@ use Friendica\Util\DateTimeFormat; use dba; require_once 'include/dba.php'; -require_once 'include/datetime.php'; /** * @brief functions for interacting with a process diff --git a/src/Model/Queue.php b/src/Model/Queue.php index da7a8b3e58..3c3cf379a4 100644 --- a/src/Model/Queue.php +++ b/src/Model/Queue.php @@ -10,7 +10,6 @@ use Friendica\Util\DateTimeFormat; use dba; require_once 'include/dba.php'; -require_once 'include/datetime.php'; class Queue { diff --git a/src/Module/Login.php b/src/Module/Login.php index 53ab57585f..b0b5a4947d 100644 --- a/src/Module/Login.php +++ b/src/Module/Login.php @@ -17,7 +17,6 @@ use Exception; use LightOpenID; require_once 'boot.php'; -require_once 'include/datetime.php'; require_once 'include/security.php'; require_once 'include/text.php'; diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 1e5c5345f6..bd66f487ac 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -34,7 +34,6 @@ use SimpleXMLElement; require_once 'include/dba.php'; require_once 'include/items.php'; require_once 'include/bb2diaspora.php'; -require_once 'include/datetime.php'; /** * @brief This class contain functions to create and send Diaspora XML files diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index 7f351ed059..7c1015c9aa 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -23,7 +23,6 @@ use DOMXPath; use Exception; require_once 'include/dba.php'; -require_once 'include/datetime.php'; require_once 'include/html2bbcode.php'; class PortableContact diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index 7c8e5bc0f4..ad7b4b7f1a 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -17,8 +17,6 @@ Class Cron { public static function execute($parameter = '', $generation = 0) { global $a; - require_once 'include/datetime.php'; - // Poll contacts with specific parameters if (!empty($parameter)) { self::pollContacts($parameter, $generation); diff --git a/src/Worker/CronHooks.php b/src/Worker/CronHooks.php index cf5759e598..2bbe529ba9 100644 --- a/src/Worker/CronHooks.php +++ b/src/Worker/CronHooks.php @@ -14,8 +14,6 @@ Class CronHooks { public static function execute($hook = '') { global $a; - require_once 'include/datetime.php'; - if (($hook != '') && is_array($a->hooks) && array_key_exists("cron", $a->hooks)) { foreach ($a->hooks["cron"] as $single_hook) { if ($single_hook[1] == $hook) { diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index 6dc028ea0e..06e5c61433 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -25,7 +25,6 @@ class CronJobs { global $a; - require_once 'include/datetime.php'; require_once 'mod/nodeinfo.php'; // No parameter set? So return diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 1a299b072f..0a77f7b5be 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -18,7 +18,6 @@ use Friendica\Protocol\Email; use dba; require_once 'include/html2plain.php'; -require_once 'include/datetime.php'; require_once 'include/items.php'; require_once 'include/bbcode.php'; diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php index b3f4dab786..a5e1e6ee2d 100644 --- a/src/Worker/DiscoverPoCo.php +++ b/src/Worker/DiscoverPoCo.php @@ -14,8 +14,6 @@ use Friendica\Protocol\PortableContact; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; -require_once 'include/datetime.php'; - class DiscoverPoCo { /// @todo Clean up this mess of a parameter hell and split it in several classes public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '') diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php index ce614e377c..cf6e78cb72 100644 --- a/src/Worker/Expire.php +++ b/src/Worker/Expire.php @@ -19,7 +19,6 @@ class Expire { public static function execute($param = '', $hook_name = '') { global $a; - require_once 'include/datetime.php'; require_once 'include/items.php'; Addon::loadHooks(); diff --git a/src/Worker/GProbe.php b/src/Worker/GProbe.php index bd209b5782..d6c0ae122d 100644 --- a/src/Worker/GProbe.php +++ b/src/Worker/GProbe.php @@ -11,8 +11,6 @@ use Friendica\Model\GContact; use Friendica\Network\Probe; use Friendica\Protocol\PortableContact; -require_once 'include/datetime.php'; - class GProbe { public static function execute($url = '') { diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index f28b8c68a1..2dc5dca581 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -19,7 +19,6 @@ use dba; require_once 'include/dba.php'; require_once 'include/html2plain.php'; -require_once 'include/datetime.php'; require_once 'include/items.php'; require_once 'include/bbcode.php'; diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index f8ea311c29..42c2774faa 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -24,7 +24,6 @@ class OnePoll public static function execute($contact_id = 0, $command = '') { global $a; - require_once 'include/datetime.php'; require_once 'include/items.php'; logger('start'); diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php index e73018f517..10a83e5c4b 100644 --- a/src/Worker/Queue.php +++ b/src/Worker/Queue.php @@ -16,7 +16,6 @@ use Friendica\Protocol\Salmon; use dba; require_once 'include/dba.php'; -require_once 'include/datetime.php'; require_once 'include/items.php'; require_once 'include/bbcode.php'; -- 2.39.5