Add Temporal::utcNow()

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 8e32f60aec24b59a66dda78bcaf108387e30afd8..bdc64a8ac24c7d97b92c76c78b8a121c073c5dcb 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -17,6 +17,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -554,8 +556,8 @@ class Profile
                                WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
                                ORDER BY `start` ASC ",
                                local_user(),
-                               datetime_convert('UTC', 'UTC', 'now + 6 days'),
-                               datetime_convert('UTC', 'UTC', 'now')
+                               Temporal::convert('now + 6 days'),
+                               Temporal::utcNow()
                        );
                        if (DBM::is_result($s)) {
                                $r = dba::inArray($s);
@@ -598,7 +600,7 @@ class Profile
 
                                        $rr['link'] = $url;
                                        $rr['title'] = $rr['name'];
-                                       $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
+                                       $rr['date'] = day_translate(Temporal::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
                                        $rr['startime'] = null;
                                        $rr['today'] = $today;
                                }
@@ -642,8 +644,8 @@ class Profile
                        WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
                        ORDER BY `start` ASC ",
                        local_user(),
-                       datetime_convert('UTC', 'UTC', 'now + 7 days'),
-                       datetime_convert('UTC', 'UTC', 'now - 1 days')
+                       Temporal::convert('now + 7 days'),
+                       Temporal::convert('now - 1 days')
                );
 
                $r = [];
@@ -656,8 +658,8 @@ class Profile
                                        $total ++;
                                }
 
-                               $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start'], 'Y-m-d');
-                               if ($strt === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
+                               $strt = Temporal::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+                               if ($strt === Temporal::convert('now', $a->timezone, 'UTC', 'Y-m-d')) {
                                        $istoday = true;
                                }
 
@@ -672,17 +674,17 @@ class Profile
                                        $description = L10n::t('[No description]');
                                }
 
-                               $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start']);
+                               $strt = Temporal::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
 
-                               if (substr($strt, 0, 10) < datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
+                               if (substr($strt, 0, 10) < Temporal::convert('now', $a->timezone, 'UTC', 'Y-m-d')) {
                                        continue;
                                }
 
-                               $today = ((substr($strt, 0, 10) === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) ? true : false);
+                               $today = ((substr($strt, 0, 10) === Temporal::convert('now', $a->timezone, 'UTC', 'Y-m-d')) ? true : false);
 
                                $rr['title'] = $title;
                                $rr['description'] = $description;
-                               $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
+                               $rr['date'] = day_translate(Temporal::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
                                $rr['startime'] = $strt;
                                $rr['today'] = $today;
 
@@ -728,8 +730,8 @@ class Profile
                                $short_bd_format = L10n::t('j F');
 
                                $val = intval($a->profile['dob']) ?
-                                       day_translate(datetime_convert('UTC', 'UTC', $a->profile['dob'] . ' 00:00 +00:00', $year_bd_format))
-                                       : day_translate(datetime_convert('UTC', 'UTC', '2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format));
+                                       day_translate(Temporal::convert($a->profile['dob'] . ' 00:00 +00:00', 'UTC', 'UTC', $year_bd_format))
+                                       : day_translate(Temporal::convert('2001-' . substr($a->profile['dob'], 'UTC', 'UTC', 5) . ' 00:00 +00:00', $short_bd_format));
 
                                $profile['birthday'] = [L10n::t('Birthday:'), $val];
                        }
@@ -963,7 +965,7 @@ class Profile
        public static function zrlInit(App $a)
        {
                $my_url = self::getMyURL();
-               $my_url = validate_url($my_url);
+               $my_url = Network::isUrlValid($my_url);
                if ($my_url) {
                        // Is it a DDoS attempt?
                        // The check fetches the cached value from gprobe to reduce the load for this system