Add support for legacy $lang config in App->loadConfig

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index be68f515f1c20c92dc75e844774c6a86f7063626..f10ad368ba4b02052d26c009975ee4fa4e803944 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -1,18 +1,19 @@
 <?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';
-require_once 'include/datetime.php';
 
 /**
  * Class to handle private messages
@@ -46,7 +47,7 @@ class Mail
                        return -2;
                }
 
-               $guid = get_guid(32);
+               $guid = System::createGUID(32);
                $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
                $convid = 0;
@@ -66,6 +67,7 @@ class Mail
                        }
                }
 
+               $convuri = '';
                if (!$convid) {
                        // create a new conversation
                        $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3);
@@ -74,13 +76,13 @@ class Mail
                        $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);
+                       $conv_guid = System::createGUID(32);
                        $convuri = $recip_handle . ':' . $conv_guid;
 
                        $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();
@@ -114,7 +116,7 @@ class Mail
                                'replied' => 0,
                                'uri' => $uri,
                                'parent-uri' => $replyto,
-                               'created' => datetime_convert()
+                               'created' => DateTimeFormat::utcNow()
                        ]
                );
 
@@ -172,7 +174,7 @@ class Mail
                        $subject = L10n::t('[no subject]');
                }
 
-               $guid = get_guid(32);
+               $guid = System::createGUID(32);
                $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
                $me = Probe::uri($replyto);
@@ -181,7 +183,7 @@ class Mail
                        return -2;
                }
 
-               $conv_guid = get_guid(32);
+               $conv_guid = System::createGUID(32);
 
                $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
@@ -194,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;
@@ -222,7 +224,7 @@ class Mail
                                'replied' => 0,
                                'uri' => $uri,
                                'parent-uri' => $replyto,
-                               'created' => datetime_convert(),
+                               'created' => DateTimeFormat::utcNow(),
                                'unknown' => 1
                        ]
                );