Refactor datetime_convert() into Temporal::convert()

diff --git a/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php b/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
index 718d952..405bbb1 100644 (file)
--- a/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
+++ b/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\L10n;
+use Friendica\Util\Temporal;
 
 class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
 {
@@ -67,8 +68,8 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
                        $component = dav_get_eventComponent($vevent);
 
                        if ($row["adjust"]) {
-                               $start  = datetime_convert('UTC', date_default_timezone_get(), $row["start"]);
-                               $finish = datetime_convert('UTC', date_default_timezone_get(), $row["finish"]);
+                               $start  = Temporal::convert($row["start"], date_default_timezone_get());
+                               $finish = Temporal::convert($row["finish"], date_default_timezone_get());
                        } else {
                                $start  = $row["start"];
                                $finish = $row["finish"];
@@ -115,8 +116,8 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
        private function jqcal2wdcal($row, $calendar, $base_path)
        {
                if ($row["adjust"]) {
-                       $start  = datetime_convert('UTC', date_default_timezone_get(), $row["start"]);
-                       $finish = datetime_convert('UTC', date_default_timezone_get(), $row["finish"]);
+                       $start  = Temporal::convert($row["start"], date_default_timezone_get());
+                       $finish = Temporal::convert($row["finish"], date_default_timezone_get());
                } else {
                        $start  = $row["start"];
                        $finish = $row["finish"];

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 42b1770..3730aa2 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -7,10 +7,12 @@
  * Author: Michael Johnston
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 function dwpost_install() {
        Addon::registerHook('post_local',           'addon/dwpost/dwpost.php', 'dwpost_post_local');
@@ -185,7 +187,7 @@ function dwpost_send(&$a,&$b) {
                $post = xmlify($post);
                $tags = dwpost_get_tags($b['tag']);
 
-               $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
+               $date = Temporal::convert($b['created'], $tz);
                $year = intval(substr($date,0,4));
                $mon  = intval(substr($date,5,2));
                $day  = intval(substr($date,8,2));

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 0a2b680..fa6c0e3 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -15,6 +15,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Object\Image;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -519,12 +520,12 @@ function fromgplus_fetch($a, $uid) {
                                                if (function_exists("share_header"))
                                                        $post .= share_header($item->object->actor->displayName, $item->object->actor->url,
                                                                                $item->object->actor->image->url, "",
-                                                                               datetime_convert('UTC','UTC',$item->object->published),$item->object->url);
+                                                                               Temporal::convert($item->object->published),$item->object->url);
                                                else
                                                        $post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName).
                                                                        "' profile='".$item->object->actor->url.
                                                                        "' avatar='".$item->object->actor->image->url.
-                                                                       "' posted='".datetime_convert('UTC','UTC',$item->object->published).
+                                                                       "' posted='".Temporal::convert($item->object->published).
                                                                        "' link='".$item->object->url."']";
 
                                                $post .= fromgplus_html2bbcode($item->object->content);

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 9d9f911..3c4e917 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -7,10 +7,12 @@
  * Author: Michael Johnston
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 function ijpost_install() {
     Addon::registerHook('post_local',           'addon/ijpost/ijpost.php', 'ijpost_post_local');
@@ -184,7 +186,7 @@ function ijpost_send(&$a,&$b) {
                $post = xmlify($post);
                $tags = ijpost_get_tags($b['tag']);
 
-               $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
+               $date = Temporal::convert($b['created'], $tz);
                $year = intval(substr($date,0,4));
                $mon  = intval(substr($date,5,2));
                $day  = intval(substr($date,8,2));

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 981162e..ff89e5e 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -7,10 +7,12 @@
  * Author: Michael Johnston
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 function ljpost_install() {
     Addon::registerHook('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
@@ -185,7 +187,7 @@ function ljpost_send(&$a,&$b) {
                $post = xmlify($post);
                $tags = ljpost_get_tags($b['tag']);
 
-               $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
+               $date = Temporal::convert($b['created'], $tz);
                $year = intval(substr($date,0,4));
                $mon  = intval(substr($date,5,2));
                $day  = intval(substr($date,8,2));

diff --git a/membersince/membersince.php b/membersince/membersince.php
index f1f135e..b8bbca4 100644 (file)
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -6,8 +6,10 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Util\Temporal;
 
 require_once 'include/datetime.php';
 
@@ -24,8 +26,8 @@ function membersince_uninstall()
 function membersince_display(&$a, &$b)
 {
        // Works in Vier
-       $b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . datetime_convert('UTC', date_default_timezone_get(), $a->profile['register_date']) . "</dd>\n</dl>", $b, 1);
+       $b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . Temporal::convert($a->profile['register_date'], date_default_timezone_get()) . "</dd>\n</dl>", $b, 1);
 
        // Trying for Frio
-       //$b = preg_replace('/<\/div>/', "<div id=\"aprofile-membersince\" class=\"aprofile\"><hr class=\"profile-separator\"><div class=\"profile-label-name\">" . L10n::t('Member since:') . "</div><div class=\"profile-entry\">" . datetime_convert('UTC', date_default_timezone_get(), $a->profile['register_date']) . "</div></div>", $b, 1);
+       //$b = preg_replace('/<\/div>/', "<div id=\"aprofile-membersince\" class=\"aprofile\"><hr class=\"profile-separator\"><div class=\"profile-label-name\">" . L10n::t('Member since:') . "</div><div class=\"profile-entry\">" . Temporal::convert($a->profile['register_date'], date_default_timezone_get()) . "</div></div>", $b, 1);
 }

diff --git a/public_server/public_server.php b/public_server/public_server.php
index d3309e6..52c115a 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -5,10 +5,12 @@
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
+use Friendica\Util\Temporal;
 
 function public_server_install() {
 
@@ -37,7 +39,7 @@ function public_server_register_account($a,$b) {
                return;
 
        $r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
-               dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
+               dbesc(Temporal::convert('now +' . $days . ' days')),
                intval($days_posts),
                intval($uid)
        );
@@ -67,7 +69,7 @@ function public_server_cron($a,$b) {
                        ]);
 
                        q("update user set expire_notification_sent = '%s' where uid = %d",
-                               dbesc(datetime_convert()),
+                               dbesc(Temporal::convert()),
                                intval($rr['uid'])
                        );
                }
@@ -85,7 +87,7 @@ function public_server_cron($a,$b) {
                if(count($r)) {
                        foreach($r as $rr)
                                q("update user set account_expires_on = '%s' where uid = %d",
-                                       dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
+                                       dbesc(Temporal::convert('now +' . '6 days')),
                                        intval($rr['uid'])
                        );
                }
@@ -98,7 +100,7 @@ function public_server_cron($a,$b) {
                if(count($r)) {
                        foreach($r as $rr)
                                q("update user set account_expires_on = '%s' where uid = %d",
-                                       dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
+                                       dbesc(Temporal::convert('now +' . '6 days')),
                                        intval($rr['uid'])
                                );
                }
@@ -136,7 +138,7 @@ function public_server_login($a,$b) {
        if(! $days)
                return;
        $r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
-       dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
+       dbesc(Temporal::convert('now +' . $days . ' days')),
        local_user()
        );
 }

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 970bbf0..bdc5679 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -5,6 +5,7 @@
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -13,10 +14,11 @@ use Friendica\Core\Worker;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
-use Friendica\Model\User;
 use Friendica\Model\Item;
 use Friendica\Model\Queue;
 use Friendica\Util\Network;
+use Friendica\Model\User;
+use Friendica\Util\Temporal;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -869,7 +871,7 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
        }
 
        $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'",
-               dbesc(datetime_convert()),
+               dbesc(Temporal::convert()),
                dbesc(ACTIVITY_LIKE),
                intval($uid),
                intval($contactid),
@@ -1000,7 +1002,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
                                        `location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
                                VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
                        intval($uid),
-                       dbesc(datetime_convert()),
+                       dbesc(Temporal::convert()),
                        dbesc($contact->url),
                        dbesc(normalise_link($contact->url)),
                        dbesc(str_replace("acct:", "", $contact->id)),
@@ -1209,11 +1211,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
        if ($post->object->displayName != "")
                $postarray['title'] = $post->object->displayName;
 
-       $postarray['created'] = datetime_convert('UTC','UTC',$post->published);
+       $postarray['created'] = Temporal::convert($post->published);
        if (isset($post->updated))
-               $postarray['edited'] = datetime_convert('UTC','UTC',$post->updated);
+               $postarray['edited'] = Temporal::convert($post->updated);
        elseif (isset($post->received))
-               $postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
+               $postarray['edited'] = Temporal::convert($post->received);
        else
                $postarray['edited'] = $postarray['created'];
 
@@ -1228,7 +1230,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 
                        $postarray['body'] = share_header($share_author, $post->object->author->url,
                                                        $post->object->author->image->url, "",
-                                                       datetime_convert('UTC','UTC',$post->object->created),
+                                                       Temporal::convert($post->object->created),
                                                        $post->links->self->href).
                                                $postarray['body']."[/share]";
 
@@ -1236,7 +1238,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                        $postarray['body'] = "[share author='".$share_author.
                                        "' profile='".$post->object->author->url.
                                        "' avatar='".$post->object->author->image->url.
-                                       "' posted='".datetime_convert('UTC','UTC',$post->object->created).
+                                       "' posted='".Temporal::convert($post->object->created, 'UTC', 'UTC', ).
                                        "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
                        */
                } else {

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index d4d74f4..5709541 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -38,6 +38,8 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
 require_once 'include/enotify.php';
 
+use Codebird\Codebird;
+use CodebirdSN\CodebirdSN;
 use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
@@ -52,6 +54,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 function statusnet_install()
 {
@@ -933,7 +936,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
                                        `location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
                                        VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
                        intval($uid),
-                       dbesc(datetime_convert()),
+                       dbesc(Temporal::convert()),
                        dbesc($contact->statusnet_profile_url),
                        dbesc(normalise_link($contact->statusnet_profile_url)),
                        dbesc(statusnet_address($contact)),
@@ -974,13 +977,13 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
                        dbesc($photos[0]),
                        dbesc($photos[1]),
                        dbesc($photos[2]),
-                       dbesc(datetime_convert()),
+                       dbesc(Temporal::convert()),
                        intval($contact_id)
                );
        } else {
                // update profile photos once every two weeks as we have no notification of when they change.
-               //$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
-               $update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
+               //$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false);
+               $update_photo = ($r[0]['avatar-date'] < Temporal::convert('now -12 hours'));
 
                // check that we have all the photos, this has been known to fail on occasion
                if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@@ -1005,9 +1008,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
                                dbesc($photos[0]),
                                dbesc($photos[1]),
                                dbesc($photos[2]),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
+                               dbesc(Temporal::convert()),
+                               dbesc(Temporal::convert()),
+                               dbesc(Temporal::convert()),
                                dbesc($contact->statusnet_profile_url),
                                dbesc(normalise_link($contact->statusnet_profile_url)),
                                dbesc(statusnet_address($contact)),
@@ -1194,8 +1197,8 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
        $postarray['body'] = $converted["body"];
        $postarray['tag'] = $converted["tags"];
 
-       $postarray['created'] = datetime_convert('UTC', 'UTC', $content->created_at);
-       $postarray['edited'] = datetime_convert('UTC', 'UTC', $content->created_at);
+       $postarray['created'] = Temporal::convert($content->created_at);
+       $postarray['edited'] = Temporal::convert($content->created_at);
 
        if (is_string($content->place->name)) {
                $postarray["location"] = $content->place->name;

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 87c6de3..efff8c2 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -5,10 +5,12 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
+use Friendica\Util\Temporal;
 
 function testdrive_install() {
 
@@ -42,7 +44,7 @@ function testdrive_register_account($a,$b) {
                return;
 
        $r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
-               dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
+               dbesc(Temporal::convert('now +' . $days . ' days')),
                intval($uid)
        );
 
@@ -70,7 +72,7 @@ function testdrive_cron($a,$b) {
                        ]);
 
                        q("update user set expire_notification_sent = '%s' where uid = %d",
-                               dbesc(datetime_convert()),
+                               dbesc(Temporal::convert()),
                                intval($rr['uid'])
                        );
 

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 1863b8b..d6d0ba7 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -78,6 +78,7 @@ use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -1016,7 +1017,7 @@ function twitter_fetch_contact($uid, $contact, $create_user)
                                        `location`, `about`, `writable`, `blocked`, `readonly`, `pending`)
                                        VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
                        intval($uid),
-                       dbesc(datetime_convert()),
+                       dbesc(Temporal::convert()),
                        dbesc("https://twitter.com/" . $contact->screen_name),
                        dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
                        dbesc($contact->screen_name."@twitter.com"),
@@ -1060,16 +1061,16 @@ function twitter_fetch_contact($uid, $contact, $create_user)
                                dbesc($photos[0]),
                                dbesc($photos[1]),
                                dbesc($photos[2]),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
+                               dbesc(Temporal::convert()),
+                               dbesc(Temporal::convert()),
+                               dbesc(Temporal::convert()),
                                intval($contact_id)
                        );
                }
        } else {
                // update profile photos once every two weeks as we have no notification of when they change.
-               //$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
-               $update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
+               //$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false);
+               $update_photo = ($r[0]['avatar-date'] < Temporal::convert('now -12 hours'));
 
                // check that we have all the photos, this has been known to fail on occasion
                if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@@ -1095,9 +1096,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
                                        dbesc($photos[0]),
                                        dbesc($photos[1]),
                                        dbesc($photos[2]),
-                                       dbesc(datetime_convert()),
-                                       dbesc(datetime_convert()),
-                                       dbesc(datetime_convert()),
+                                       dbesc(Temporal::convert()),
+                                       dbesc(Temporal::convert()),
+                                       dbesc(Temporal::convert()),
                                        dbesc("https://twitter.com/".$contact->screen_name),
                                        dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
                                        dbesc($contact->screen_name."@twitter.com"),
@@ -1489,8 +1490,8 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
        $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
        $postarray['body'] = $converted["body"];
        $postarray['tag'] = $converted["tags"];
-       $postarray['created'] = datetime_convert('UTC', 'UTC', $post->created_at);
-       $postarray['edited'] = datetime_convert('UTC', 'UTC', $post->created_at);
+       $postarray['created'] = Temporal::convert($post->created_at);
+       $postarray['edited'] = Temporal::convert($post->created_at);
 
        $statustext = $converted["plain"];