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

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index d789d69de03749d5d9dc697dd73dd90143a2b0a7..f9b4c4d6dbddba324d2b4c84d9a47160ca28b4b7 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -1,13 +1,16 @@
 <?php
+
 /**
  * @file src/Model/Mail.php
  */
 namespace Friendica\Model;
 
-use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Network\Probe;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -35,7 +38,7 @@ class Mail
                }
 
                if (!strlen($subject)) {
-                       $subject = t('[no subject]');
+                       $subject = L10n::t('[no subject]');
                }
 
                $me = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
@@ -67,10 +70,10 @@ class Mail
 
                if (!$convid) {
                        // create a new conversation
-                       $recip_host = substr($contact[0]['url'], strpos($contact[0]['url'], '://') + 3);
+                       $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3);
                        $recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
 
-                       $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
+                       $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
                        $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
                        $conv_guid = get_guid(32);
@@ -79,7 +82,7 @@ class Mail
                        $handles = $recip_handle . ';' . $sender_handle;
 
                        $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
-                               'created' => datetime_convert(), 'updated' => datetime_convert(),
+                               'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
                                'subject' => $subject, 'recips' => $handles];
                        if (dba::insert('conv', $fields)) {
                                $convid = dba::lastInsertId();
@@ -102,18 +105,18 @@ class Mail
                                'uid' => local_user(),
                                'guid' => $guid,
                                'convid' => $convid,
-                               'from-name' => $me[0]['name'],
-                               'from-photo' => $me[0]['thumb'],
-                               'from-url' => $me[0]['url'],
-                               `contact-id` => $recipient,
-                               `title` => $subject,
-                               `body` => $body,
-                               `seen` => true,
-                               `reply` => $reply,
-                               `replied` => false,
-                               `uri` => $uri,
-                               `parent-uri` => $replyto,
-                               `created` => datetime_convert()
+                               'from-name' => $me['name'],
+                               'from-photo' => $me['thumb'],
+                               'from-url' => $me['url'],
+                               'contact-id' => $recipient,
+                               'title' => $subject,
+                               'body' => $body,
+                               'seen' => 1,
+                               'reply' => $reply,
+                               'replied' => 0,
+                               'uri' => $uri,
+                               'parent-uri' => $replyto,
+                               'created' => DateTimeFormat::utcNow()
                        ]
                );
 
@@ -168,7 +171,7 @@ class Mail
                }
 
                if (!strlen($subject)) {
-                       $subject = t('[no subject]');
+                       $subject = L10n::t('[no subject]');
                }
 
                $guid = get_guid(32);
@@ -193,12 +196,12 @@ class Mail
 
                $convid = null;
                $fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
-                       'created' => datetime_convert(), 'updated' => datetime_convert(),
+                       'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
                        'subject' => $subject, 'recips' => $handles];
                if (dba::insert('conv', $fields)) {
                        $convid = dba::lastInsertId();
                }
-               
+
                if (!$convid) {
                        logger('send message: conversation not found.');
                        return -4;
@@ -207,22 +210,22 @@ class Mail
                dba::insert(
                        'mail',
                        [
-                               `uid` => $recipient['uid'],
-                               `guid` => $guid,
-                               `convid` => $convid,
-                               `from-name` => $me['name'],
-                               `from-photo` => $me['photo'],
-                               `from-url` => $me['url'],
-                               `contact-id` => 0,
-                               `title` => $subject,
-                               `body` => $body,
-                               `seen` => false,
-                               `reply` => false,
-                               `replied` => false,
-                               `uri` => $uri,
-                               `parent-uri` => $replyto,
-                               `created` => datetime_convert(),
-                               `unknown` => true
+                               'uid' => $recipient['uid'],
+                               'guid' => $guid,
+                               'convid' => $convid,
+                               'from-name' => $me['name'],
+                               'from-photo' => $me['photo'],
+                               'from-url' => $me['url'],
+                               'contact-id' => 0,
+                               'title' => $subject,
+                               'body' => $body,
+                               'seen' => 0,
+                               'reply' => 0,
+                               'replied' => 0,
+                               'uri' => $uri,
+                               'parent-uri' => $replyto,
+                               'created' => DateTimeFormat::utcNow(),
+                               'unknown' => 1
                        ]
                );