Move Temporal::convert() to DateTimeFormat::convert()

[friendica.git] / src / Core / NotificationsManager.php

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 654ed5cc48d6fa64e022efa3909545c1c2f9e7f1..356ed4a472e57aad7145077ecf23f3f01468199d 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -13,7 +13,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Util\Network;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\XML;
 
 require_once 'include/dba.php';
 require_once 'include/html2plain.php';
@@ -42,7 +43,7 @@ class NotificationsManager extends BaseObject
        {
                $rets = [];
                foreach ($notes as $n) {
-                       $local_time = datetime_convert('UTC', date_default_timezone_get(), $n['date']);
+                       $local_time = DateTimeFormat::local($n['date']);
                        $n['timestamp'] = strtotime($local_time);
                        $n['date_rel'] = relative_date($n['date']);
                        $n['msg_html'] = bbcode($n['msg'], false, false, false, false);
@@ -243,7 +244,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['url'];
                                                $default_item_text = strip_tags(bbcode($it['msg']));
-                                               $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r');
+                                               $default_item_when = DateTimeFormat::local($it['date'], 'r');
                                                $default_item_ago = relative_date($it['date']);
                                                break;
 
@@ -253,7 +254,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
                                                $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 = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+                                               $default_item_when = DateTimeFormat::local($it['created'], 'r');
                                                $default_item_ago = relative_date($it['created']);
                                                break;
 
@@ -265,7 +266,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_text = (($it['id'] == $it['parent'])
                                                                        ? 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 = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+                                               $default_item_when = DateTimeFormat::local($it['created'], 'r');
                                                $default_item_ago = relative_date($it['created']);
                                }
 
@@ -338,7 +339,7 @@ class NotificationsManager extends BaseObject
 
                                        case ACTIVITY_FRIEND:
                                                $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
-                                               $obj = Network::parseXmlString($xmlhead . $it['object']);
+                                               $obj = XML::parseString($xmlhead . $it['object']);
                                                $it['fname'] = $obj->title;
 
                                                $notif = [