Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 815b0051d9df1ff0b5cc7ef2d2c3eea09fb85053..2d304e55f8b92142544fd65781a424af44b56880 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -13,8 +13,6 @@ use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 /**
  * Class to handle private messages
  */
@@ -27,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;
@@ -143,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()]);
                                }
                        }
                }
@@ -157,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;