Merge pull request #7862 from annando/mail-again

[friendica.git] / src / Protocol / Email.php

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 3df39af00719e80da3b7f41dd7fb5fa417c6b7cd..43ab88d3092f4c49b2eed15fe4277796b83e17f2 100644 (file)
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -6,8 +6,10 @@ namespace Friendica\Protocol;
 
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Model\Item;
+use Friendica\Util\Strings;
 
 /**
  * @brief Email class
@@ -54,21 +56,21 @@ class Email
                        return [];
                }
 
-               $search1 = @imap_search($mbox, 'FROM "' . $email_addr . '"', SE_UID);
+               $search1 = @imap_search($mbox, 'UNDELETED FROM "' . $email_addr . '"', SE_UID);
                if (!$search1) {
                        $search1 = [];
                } else {
                        Logger::log("Found mails from ".$email_addr, Logger::DEBUG);
                }
 
-               $search2 = @imap_search($mbox, 'TO "' . $email_addr . '"', SE_UID);
+               $search2 = @imap_search($mbox, 'UNDELETED TO "' . $email_addr . '"', SE_UID);
                if (!$search2) {
                        $search2 = [];
                } else {
                        Logger::log("Found mails to ".$email_addr, Logger::DEBUG);
                }
 
-               $search3 = @imap_search($mbox, 'CC "' . $email_addr . '"', SE_UID);
+               $search3 = @imap_search($mbox, 'UNDELETED CC "' . $email_addr . '"', SE_UID);
                if (!$search3) {
                        $search3 = [];
                } else {
@@ -110,28 +112,36 @@ class Email
         * @return array
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function getMessage($mbox, $uid, $reply)
+       public static function getMessage($mbox, $uid, $reply, $item)
        {
-               $ret = [];
+               $ret = $item;
 
                $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null);
 
                if (!$struc) {
+                       Logger::notice("IMAP structure couldn't be fetched", ['uid' => $uid]);
                        return $ret;
                }
 
                if (empty($struc->parts)) {
-                       $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html');
-                       $html = $ret['body'];
+                       $html = trim(self::messageGetPart($mbox, $uid, $struc, 0, 'html'));
 
-                       if (trim($ret['body']) == '') {
-                               $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
-                       } else {
-                               $message = ['text' => '', 'html' => $ret['body']];
+                       if (!empty($html)) {
+                               $message = ['text' => '', 'html' => $html, 'item' => $ret];
                                Hook::callAll('email_getmessage', $message);
-                               $ret['body'] = $message['html'];
+                               $ret = $message['item'];
+                               if (empty($ret['body'])) {
+                                       $ret['body'] = HTML::toBBCode($message['html']);
+                               }
+                       }
+
+                       if (empty($ret['body'])) {
+                               $text = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
 
-                               $ret['body'] = HTML::toBBCode($ret['body']);
+                               $message = ['text' => $text, 'html' => '', 'item' => $ret];
+                               Hook::callAll('email_getmessage', $message);
+                               $ret = $message['item'];
+                               $ret['body'] = $message['text'];
                        }
                } else {
                        $text = '';
@@ -148,15 +158,16 @@ class Email
                                }
                        }
 
-                       $message = ['text' => trim($text), 'html' => trim($html)];
+                       $message = ['text' => trim($text), 'html' => trim($html), 'item' => $ret];
                        Hook::callAll('email_getmessage', $message);
-                       $html = $message['html'];
-                       $text = $message['text'];
+                       $ret = $message['item'];
 
-                       if (!empty($html)) {
-                               $ret['body'] = HTML::toBBCode($html);
-                       } else {
-                               $ret['body'] = $text;
+                       if (empty($ret['body']) && !empty($message['html'])) {
+                               $ret['body'] = HTML::toBBCode($message['html']);
+                       }
+
+                       if (empty($ret['body'])) {
+                               $ret['body'] = $message['text'];
                        }
                }
 
@@ -171,6 +182,9 @@ class Email
 
                $ret['body'] = self::unifyAttributionLine($ret['body']);
 
+               $ret['body'] = Strings::escapeHtml($ret['body']);
+               $ret['body'] = BBCode::limitBodySize($ret['body']);
+
                Hook::callAll('email_getmessage_end', $ret);
 
                return $ret;
@@ -321,7 +335,7 @@ class Email
        }
 
        /**
-        * Function send is used by Protocol::EMAIL and Protocol::EMAIL2 code
+        * Function send is used by Protocol::EMAIL code
         * (not to notify the user, but to send items to email contacts)
         *
         * @param string $addr    address