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

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 4f3a9ca7394a913bc67aaeccfa5f4670c60f8985..1d31c6cb5b38f5a50a547f2d54b1e2fcb4aeb341 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -20,8 +20,8 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 
 require_once 'boot.php';
@@ -112,7 +112,7 @@ class Contact extends BaseObject
 
                $return = dba::insert('contact', [
                        'uid'         => $user['uid'],
-                       'created'     => datetime_convert(),
+                       'created'     => DateTimeFormat::utcNow(),
                        'self'        => 1,
                        'name'        => $user['username'],
                        'nick'        => $user['nickname'],
@@ -129,9 +129,9 @@ class Contact extends BaseObject
                        'poll'        => System::baseUrl() . '/dfrn_poll/'    . $user['nickname'],
                        'confirm'     => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
                        'poco'        => System::baseUrl() . '/poco/'         . $user['nickname'],
-                       'name-date'   => datetime_convert(),
-                       'uri-date'    => datetime_convert(),
-                       'avatar-date' => datetime_convert(),
+                       'name-date'   => DateTimeFormat::utcNow(),
+                       'uri-date'    => DateTimeFormat::utcNow(),
+                       'avatar-date' => DateTimeFormat::utcNow(),
                        'closeness'   => 0
                ]);
 
@@ -210,10 +210,10 @@ class Contact extends BaseObject
                }
 
                if ($contact['term-date'] <= NULL_DATE) {
-                       dba::update('contact', ['term-date' => datetime_convert()], ['id' => $contact['id']]);
+                       dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 
                        if ($contact['url'] != '') {
-                               dba::update('contact', ['term-date' => datetime_convert()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
+                               dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
                        }
                } else {
                        /* @todo
@@ -224,7 +224,7 @@ class Contact extends BaseObject
 
                        /// @todo Check for contact vitality via probing
                        $expiry = $contact['term-date'] . ' + 32 days ';
-                       if (datetime_convert() > datetime_convert('UTC', 'UTC', $expiry)) {
+                       if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
                                /* Relationship is really truly dead. archive them rather than
                                 * delete, though if the owner tries to unarchive them we'll start
                                 * the whole process over again.
@@ -688,7 +688,7 @@ class Contact extends BaseObject
                        $contact_id = $contact["id"];
 
                        // Update the contact every 7 days
-                       $update_contact = ($contact['avatar-date'] < datetime_convert('', '', 'now -7 days'));
+                       $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
 
                        // We force the update if the avatar is empty
                        if (!x($contact, 'avatar')) {
@@ -728,7 +728,7 @@ class Contact extends BaseObject
                if (!$contact_id) {
                        dba::insert('contact', [
                                'uid'       => $uid,
-                               'created'   => datetime_convert(),
+                               'created'   => DateTimeFormat::utcNow(),
                                'url'       => $data["url"],
                                'nurl'      => normalise_link($data["url"]),
                                'addr'      => $data["addr"],
@@ -749,9 +749,9 @@ class Contact extends BaseObject
                                'request'   => $data["request"],
                                'confirm'   => $data["confirm"],
                                'poco'      => $data["poco"],
-                               'name-date' => datetime_convert(),
-                               'uri-date'  => datetime_convert(),
-                               'avatar-date' => datetime_convert(),
+                               'name-date' => DateTimeFormat::utcNow(),
+                               'uri-date'  => DateTimeFormat::utcNow(),
+                               'avatar-date' => DateTimeFormat::utcNow(),
                                'writable'  => 1,
                                'blocked'   => 0,
                                'readonly'  => 0,
@@ -823,13 +823,13 @@ class Contact extends BaseObject
                }
 
                if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
-                       $updated['uri-date'] = datetime_convert();
+                       $updated['uri-date'] = DateTimeFormat::utcNow();
                }
                if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
-                       $updated['name-date'] = datetime_convert();
+                       $updated['name-date'] = DateTimeFormat::utcNow();
                }
 
-               $updated['avatar-date'] = datetime_convert();
+               $updated['avatar-date'] = DateTimeFormat::utcNow();
 
                dba::update('contact', $updated, ['id' => $contact_id], $contact);
 
@@ -1026,7 +1026,7 @@ class Contact extends BaseObject
                        if ($photos) {
                                dba::update(
                                        'contact',
-                                       ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()],
+                                       ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
                                        ['id' => $cid]
                                );
 
@@ -1261,7 +1261,7 @@ class Contact extends BaseObject
                        // create contact record
                        dba::insert('contact', [
                                'uid'     => $uid,
-                               'created' => datetime_convert(),
+                               'created' => DateTimeFormat::utcNow(),
                                'url'     => $ret['url'],
                                'nurl'    => normalise_link($ret['url']),
                                'addr'    => $ret['addr'],
@@ -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']);
@@ -1485,7 +1485,7 @@ class Contact extends BaseObject
                        foreach ($r as $rr) {
                                logger('update_contact_birthday: ' . $rr['bd']);
 
-                               $nextbd = Temporal::convert('now', 'UTC', 'UTC', 'Y') . substr($rr['bd'], 4);
+                               $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4);
 
                                /*
                                 * Add new birthday event for this person
@@ -1497,7 +1497,7 @@ class Contact extends BaseObject
 
                                // Check for duplicates
                                $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
-                                       intval($rr['uid']), intval($rr['id']), dbesc(Temporal::convert($nextbd)), dbesc('birthday'));
+                                       intval($rr['uid']), intval($rr['id']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday'));
 
                                if (DBM::is_result($s)) {
                                        continue;
@@ -1508,8 +1508,8 @@ class Contact extends BaseObject
 
                                q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
                                VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
-                                       dbesc(Temporal::convert()), dbesc(Temporal::convert()), dbesc(Temporal::convert($nextbd)),
-                                       dbesc(Temporal::convert($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
+                                       dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)),
+                                       dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
                                        intval(0)
                                );