Remove references to include/datetime
This commit is contained in:
parent
cea80c78e4
commit
f020292408
1
boot.php
1
boot.php
|
@ -32,7 +32,6 @@ use Friendica\Model\Contact;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
require_once 'include/text.php';
|
require_once 'include/text.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
define('FRIENDICA_PLATFORM', 'Friendica');
|
define('FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define('FRIENDICA_CODENAME', 'Asparagus');
|
define('FRIENDICA_CODENAME', 'Asparagus');
|
||||||
|
|
|
@ -41,7 +41,6 @@ use Friendica\Util\Network;
|
||||||
use Friendica\Util\XML;
|
use Friendica\Util\XML;
|
||||||
|
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
require_once 'include/html2plain.php';
|
require_once 'include/html2plain.php';
|
||||||
require_once 'mod/share.php';
|
require_once 'mod/share.php';
|
||||||
|
|
|
@ -6,8 +6,6 @@ use Friendica\Database\DBM;
|
||||||
use Friendica\Database\DBStructure;
|
use Friendica\Database\DBStructure;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
require_once('include/datetime.php');
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @class MySQL database class
|
* @class MySQL database class
|
||||||
*
|
*
|
||||||
|
|
|
@ -16,7 +16,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Map;
|
use Friendica\Util\Map;
|
||||||
|
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
|
|
||||||
function format_event_html($ev, $simple = false) {
|
function format_event_html($ev, $simple = false) {
|
||||||
|
@ -238,7 +237,6 @@ function event_delete($event_id) {
|
||||||
*/
|
*/
|
||||||
function event_store($arr) {
|
function event_store($arr) {
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
|
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/event.php';
|
require_once 'include/event.php';
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
|
|
||||||
|
|
|
@ -253,7 +253,6 @@ function install_content(App $a) {
|
||||||
return $o;
|
return $o;
|
||||||
}; break;
|
}; break;
|
||||||
case 3: { // Site settings
|
case 3: { // Site settings
|
||||||
require_once('include/datetime.php');
|
|
||||||
$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||||
$dbuser = notags(trim($_POST['dbuser']));
|
$dbuser = notags(trim($_POST['dbuser']));
|
||||||
$dbpass = notags(trim($_POST['dbpass']));
|
$dbpass = notags(trim($_POST['dbpass']));
|
||||||
|
|
|
@ -9,8 +9,6 @@ use Friendica\Core\System;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
function localtime_post(App $a)
|
function localtime_post(App $a)
|
||||||
{
|
{
|
||||||
$t = $_REQUEST['time'];
|
$t = $_REQUEST['time'];
|
||||||
|
|
|
@ -11,7 +11,6 @@ use Friendica\Model\User;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
require_once 'boot.php';
|
require_once 'boot.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/enotify.php';
|
require_once 'include/enotify.php';
|
||||||
require_once 'include/text.php';
|
require_once 'include/text.php';
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
use Friendica\Util\XML;
|
use Friendica\Util\XML;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
require_once 'mod/proxy.php';
|
require_once 'mod/proxy.php';
|
||||||
require_once 'include/enotify.php';
|
require_once 'include/enotify.php';
|
||||||
|
|
|
@ -10,8 +10,6 @@ use Friendica\Database\DBM;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Mimetype;
|
use Friendica\Util\Mimetype;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
function wall_attach_post(App $a) {
|
function wall_attach_post(App $a) {
|
||||||
|
|
||||||
$r_json = (x($_GET,'response') && $_GET['response']=='json');
|
$r_json = (x($_GET,'response') && $_GET['response']=='json');
|
||||||
|
|
|
@ -19,7 +19,6 @@ use Friendica\Util\XML;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/html2plain.php';
|
require_once 'include/html2plain.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -19,7 +19,6 @@ use Friendica\Util\Network;
|
||||||
use dba;
|
use dba;
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/html2bbcode.php';
|
require_once 'include/html2bbcode.php';
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use dba;
|
use dba;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to handle private messages
|
* Class to handle private messages
|
||||||
|
|
|
@ -9,7 +9,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use dba;
|
use dba;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief functions for interacting with a process
|
* @brief functions for interacting with a process
|
||||||
|
|
|
@ -10,7 +10,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use dba;
|
use dba;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
class Queue
|
class Queue
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,7 +17,6 @@ use Exception;
|
||||||
use LightOpenID;
|
use LightOpenID;
|
||||||
|
|
||||||
require_once 'boot.php';
|
require_once 'boot.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/security.php';
|
require_once 'include/security.php';
|
||||||
require_once 'include/text.php';
|
require_once 'include/text.php';
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,6 @@ use SimpleXMLElement;
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/bb2diaspora.php';
|
require_once 'include/bb2diaspora.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This class contain functions to create and send Diaspora XML files
|
* @brief This class contain functions to create and send Diaspora XML files
|
||||||
|
|
|
@ -23,7 +23,6 @@ use DOMXPath;
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/html2bbcode.php';
|
require_once 'include/html2bbcode.php';
|
||||||
|
|
||||||
class PortableContact
|
class PortableContact
|
||||||
|
|
|
@ -17,8 +17,6 @@ Class Cron {
|
||||||
public static function execute($parameter = '', $generation = 0) {
|
public static function execute($parameter = '', $generation = 0) {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
// Poll contacts with specific parameters
|
// Poll contacts with specific parameters
|
||||||
if (!empty($parameter)) {
|
if (!empty($parameter)) {
|
||||||
self::pollContacts($parameter, $generation);
|
self::pollContacts($parameter, $generation);
|
||||||
|
|
|
@ -14,8 +14,6 @@ Class CronHooks {
|
||||||
public static function execute($hook = '') {
|
public static function execute($hook = '') {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
if (($hook != '') && is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
|
if (($hook != '') && is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
|
||||||
foreach ($a->hooks["cron"] as $single_hook) {
|
foreach ($a->hooks["cron"] as $single_hook) {
|
||||||
if ($single_hook[1] == $hook) {
|
if ($single_hook[1] == $hook) {
|
||||||
|
|
|
@ -25,7 +25,6 @@ class CronJobs
|
||||||
{
|
{
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'mod/nodeinfo.php';
|
require_once 'mod/nodeinfo.php';
|
||||||
|
|
||||||
// No parameter set? So return
|
// No parameter set? So return
|
||||||
|
|
|
@ -18,7 +18,6 @@ use Friendica\Protocol\Email;
|
||||||
use dba;
|
use dba;
|
||||||
|
|
||||||
require_once 'include/html2plain.php';
|
require_once 'include/html2plain.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,6 @@ use Friendica\Protocol\PortableContact;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Network;
|
use Friendica\Util\Network;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
class DiscoverPoCo {
|
class DiscoverPoCo {
|
||||||
/// @todo Clean up this mess of a parameter hell and split it in several classes
|
/// @todo Clean up this mess of a parameter hell and split it in several classes
|
||||||
public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '')
|
public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '')
|
||||||
|
|
|
@ -19,7 +19,6 @@ class Expire {
|
||||||
public static function execute($param = '', $hook_name = '') {
|
public static function execute($param = '', $hook_name = '') {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
|
|
||||||
Addon::loadHooks();
|
Addon::loadHooks();
|
||||||
|
|
|
@ -11,8 +11,6 @@ use Friendica\Model\GContact;
|
||||||
use Friendica\Network\Probe;
|
use Friendica\Network\Probe;
|
||||||
use Friendica\Protocol\PortableContact;
|
use Friendica\Protocol\PortableContact;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
|
|
||||||
class GProbe {
|
class GProbe {
|
||||||
public static function execute($url = '')
|
public static function execute($url = '')
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,6 @@ use dba;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/html2plain.php';
|
require_once 'include/html2plain.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ class OnePoll
|
||||||
public static function execute($contact_id = 0, $command = '') {
|
public static function execute($contact_id = 0, $command = '') {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
|
|
||||||
logger('start');
|
logger('start');
|
||||||
|
|
|
@ -16,7 +16,6 @@ use Friendica\Protocol\Salmon;
|
||||||
use dba;
|
use dba;
|
||||||
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'include/datetime.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/bbcode.php';
|
require_once 'include/bbcode.php';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue