Merge pull request #4387 from MrPetovan/task/3878-move-datetime-to-src

Move include/datetime to src/ - Part 2

src/Core/NotificationsManager.php

@@ -14,11 +14,11 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 require_once 'include/dba.php';
 require_once 'include/html2plain.php';
-require_once 'include/datetime.php';
 require_once 'include/bbcode.php';
 
 /**
@@ -45,7 +45,7 @@ class NotificationsManager extends BaseObject
 		foreach ($notes as $n) {
 			$local_time = DateTimeFormat::local($n['date']);
 			$n['timestamp'] = strtotime($local_time);
-			$n['date_rel'] = relative_date($n['date']);
+			$n['date_rel'] = Temporal::getRelativeDate($n['date']);
 			$n['msg_html'] = bbcode($n['msg'], false, false, false, false);
 			$n['msg_plain'] = explode("\n", trim(html2plain($n['msg_html'], 0)))[0];
 
@@ -245,7 +245,7 @@ class NotificationsManager extends BaseObject
 						$default_item_url = $it['url'];
 						$default_item_text = strip_tags(bbcode($it['msg']));
 						$default_item_when = DateTimeFormat::local($it['date'], 'r');
-						$default_item_ago = relative_date($it['date']);
+						$default_item_ago = Temporal::getRelativeDate($it['date']);
 						break;
 
 					case 'home':
@@ -255,7 +255,7 @@ class NotificationsManager extends BaseObject
 						$default_item_url = $it['author-link'];
 						$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
 						$default_item_when = DateTimeFormat::local($it['created'], 'r');
-						$default_item_ago = relative_date($it['created']);
+						$default_item_ago = Temporal::getRelativeDate($it['created']);
 						break;
 
 					default:
@@ -267,7 +267,7 @@ class NotificationsManager extends BaseObject
 									? L10n::t("%s created a new post", $it['author-name'])
 									: L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
 						$default_item_when = DateTimeFormat::local($it['created'], 'r');
-						$default_item_ago = relative_date($it['created']);
+						$default_item_ago = Temporal::getRelativeDate($it['created']);
 				}
 
 				// Transform the different types of notification in an usable array

src/Model/Contact.php

@@ -1388,7 +1388,7 @@ class Contact extends BaseObject
 				`blocked`, `readonly`, `pending`, `writable`)
 				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
 				intval($importer['uid']),
-				dbesc(datetime_convert()),
+				dbesc(DateTimeFormat::utcNow()),
 				dbesc($url),
 				dbesc(normalise_link($url)),
 				dbesc($name),
@@ -1418,7 +1418,7 @@ class Contact extends BaseObject
 				if (is_array($contact_record)) {
 					dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
 								'blocked' => false, 'knowyou' => false,
-								'hash' => $hash, 'datetime' => datetime_convert()]);
+								'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
 				}
 
 				Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);

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';
 

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

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

src/Model/Profile.php

@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -258,7 +259,7 @@ class Profile
 	 * @param int $block
 	 * @param boolean $show_connect Show connect link
 	 *
-	 * @return HTML string suitable for sidebar inclusion
+	 * @return string HTML sidebar module
 	 *
 	 * @note Returns empty string if passed $profile is wrong type or not populated
 	 *
@@ -740,7 +741,7 @@ class Profile
 
 			if (!empty($a->profile['dob'])
 				&& $a->profile['dob'] > '0001-01-01'
-				&& $age = age($a->profile['dob'], $a->profile['timezone'], '')
+				&& $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
 			) {
 				$profile['age'] = [L10n::t('Age:'), $age];
 			}
@@ -755,7 +756,7 @@ class Profile
 			}
 
 			if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
-				$profile['howlong'] = relative_date($a->profile['howlong'], L10n::t('for %1$d %2$s'));
+				$profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
 			}
 
 			if ($a->profile['sexual']) {

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
 {

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';
 

src/Object/Post.php

@@ -14,6 +14,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -125,7 +126,7 @@ class Post extends BaseObject
 			$edited = [
 				'label'    => L10n::t('This entry was edited'),
 				'date'     => DateTimeFormat::local($item['edited'], 'r'),
-				'relative' => relative_date($item['edited'])
+				'relative' => Temporal::getRelativeDate($item['edited'])
 			];
 		}
 		$commentww = '';
@@ -365,9 +366,9 @@ class Post extends BaseObject
 			'sparkle'         => $sparkle,
 			'title'           => $title_e,
 			'localtime'       => DateTimeFormat::local($item['created'], 'r'),
-			'ago'             => $item['app'] ? L10n::t('%s from %s', relative_date($item['created']), $item['app']) : relative_date($item['created']),
+			'ago'             => $item['app'] ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created']),
 			'app'             => $item['app'],
-			'created'         => relative_date($item['created']),
+			'created'         => Temporal::getRelativeDate($item['created']),
 			'lock'            => $lock,
 			'location'        => $location_e,
 			'indent'          => $indent,

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

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

src/Util/DateTimeFormat.php

@@ -122,7 +122,7 @@ class DateTimeFormat
 		try {
 			$d = new DateTime($s, $from_obj);
 		} catch (Exception $e) {
-			logger('datetime_convert: exception: ' . $e->getMessage());
+			logger('DateTimeFormat::convert: exception: ' . $e->getMessage());
 			$d = new DateTime('now', $from_obj);
 		}
 

src/Util/Temporal.php

@@ -135,7 +135,7 @@ class Temporal
 			$value = DateTimeFormat::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d');
 		}
 
-		$age = (intval($value) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
+		$age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : "");
 
 		$tpl = get_markup_template("field_input.tpl");
 		$o = replace_macros($tpl,
@@ -165,7 +165,7 @@ class Temporal
 	 */
 	public static function getDateField($min, $max, $default, $id = 'datepicker')
 	{
-		return datetimesel($min, $max, $default, '', $id, true, false, '', '');
+		return self::getDateTimeField($min, $max, $default, '', $id, true, false, '', '');
 	}
 
 	/**
@@ -179,7 +179,7 @@ class Temporal
 	 */
 	public static function getTimeField($h, $m, $id = 'timepicker')
 	{
-		return datetimesel(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
+		return self::getDateTimeField(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
 	}
 
 	/**
@@ -393,7 +393,7 @@ class Temporal
 	 *
 	 * @return string day 0 = Sunday through 6 = Saturday
 	 */
-	public static function getFirstDayInMonth($y, $m)
+	private static function getFirstDayInMonth($y, $m)
 	{
 		$d = sprintf('%04d-%02d-01 00:00', intval($y), intval($m));
 
@@ -438,8 +438,8 @@ class Temporal
 		}
 
 		$dn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-		$f = get_first_dim($y, $m);
-		$l = get_dim($y, $m);
+		$f = self::getFirstDayInMonth($y, $m);
+		$l = self::getDaysInMonth($y, $m);
 		$d = 1;
 		$dow = 0;
 		$started = false;

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);

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) {

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
@@ -55,7 +54,7 @@ class CronJobs
 		}
 
 		if ($command == 'update_contact_birthdays') {
-			update_contact_birthdays();
+			Contact::updateBirthdays();
 			return;
 		}
 

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';
 

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 = '')

src/Worker/Expire.php

@@ -9,8 +9,8 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Model\Item;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use dba;
 
 require_once 'include/dba.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();

src/Worker/GProbe.php

@@ -6,14 +6,11 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 
-require_once 'include/datetime.php';
-
 class GProbe {
 	public static function execute($url = '')
 	{

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';
 

src/Worker/OnePoll.php

@@ -4,18 +4,17 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Content\Text\BBCode;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Util\Temporal;
-use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -25,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');

src/Worker/Queue.php

@@ -6,18 +6,16 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Queue as QueueModel;
-use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 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';