Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 24a174b6b58251df7c5dd674c4ad75d207c50b46..2d304e55f8b92142544fd65781a424af44b56880 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -6,14 +6,13 @@
 namespace Friendica\Model;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 /**
  * Class to handle private messages
  */
@@ -26,10 +25,12 @@ class Mail
         * @param string  $body      message body, default empty
         * @param string  $subject   message subject, default empty
         * @param string  $replyto   reply to
+        * @return int
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
        {
-               $a = get_app();
+               $a = \get_app();
 
                if (!$recipient) {
                        return -1;
@@ -46,7 +47,7 @@ class Mail
                        return -2;
                }
 
-               $guid = System::createGUID(32);
+               $guid = System::createUUID();
                $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
                $convid = 0;
@@ -73,7 +74,7 @@ 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 = System::createGUID(32);
+                       $conv_guid = System::createUUID();
                        $convuri = $recip_handle . ':' . $conv_guid;
 
                        $handles = $recip_handle . ';' . $sender_handle;
@@ -87,7 +88,7 @@ class Mail
                }
 
                if (!$convid) {
-                       logger('send message: conversation not found.');
+                       Logger::log('send message: conversation not found.');
                        return -4;
                }
 
@@ -142,7 +143,7 @@ class Mail
                                        }
                                        $image_uri = substr($image, strrpos($image, '/') + 1);
                                        $image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
-                                       DBA::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
+                                       Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
                                }
                        }
                }
@@ -156,12 +157,15 @@ class Mail
        }
 
        /**
-        * @param string $recipient recipient, default empty
+        * @param array  $recipient recipient, default empty
         * @param string $body      message body, default empty
         * @param string $subject   message subject, default empty
         * @param string $replyto   reply to, default empty
+        * @return int
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function sendWall($recipient = '', $body = '', $subject = '', $replyto = '')
+       public static function sendWall(array $recipient = [], $body = '', $subject = '', $replyto = '')
        {
                if (!$recipient) {
                        return -1;
@@ -171,7 +175,7 @@ class Mail
                        $subject = L10n::t('[no subject]');
                }
 
-               $guid = System::createGUID(32);
+               $guid = System::createUUID();
                $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
                $me = Probe::uri($replyto);
@@ -180,7 +184,7 @@ class Mail
                        return -2;
                }
 
-               $conv_guid = System::createGUID(32);
+               $conv_guid = System::createUUID();
 
                $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
@@ -200,7 +204,7 @@ class Mail
                }
 
                if (!$convid) {
-                       logger('send message: conversation not found.');
+                       Logger::log('send message: conversation not found.');
                        return -4;
                }