X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=e351d5c70d4a9c1e3ecf6c720e045ba2f9757407;hb=64a336ee8de35fbea9de668e2497b2dd1220fdaf;hp=09b9df05063a965bebdef4cb455ebab264e499d4;hpb=84244b1450380ce1fe8d06b9a5ac9693e0ed2391;p=friendica.git

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 09b9df0506..e351d5c70d 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Protocol/Email.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Protocol;
 
 use Friendica\Core\Hook;
@@ -12,7 +29,7 @@ use Friendica\Model\Item;
 use Friendica\Util\Strings;
 
 /**
- * @brief Email class
+ * Email class
  */
 class Email
 {
@@ -56,21 +73,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 {
@@ -119,27 +136,29 @@ class Email
 		$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'];
-
-			if (trim($ret['body']) == '') {
-				$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
+			$html = trim(self::messageGetPart($mbox, $uid, $struc, 0, 'html'));
 
-				$message = ['text' => $ret['body'], 'html' => '', 'item' => $ret];
+			if (!empty($html)) {
+				$message = ['text' => '', 'html' => $html, 'item' => $ret];
 				Hook::callAll('email_getmessage', $message);
 				$ret = $message['item'];
-				$ret['body'] = $message['text'];
-			} else {
-				$message = ['text' => '', 'html' => $ret['body'], 'item' => $ret];
+				if (empty($ret['body'])) {
+					$ret['body'] = HTML::toBBCode($message['html']);
+				}
+			}
+
+			if (empty($ret['body'])) {
+				$text = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
+
+				$message = ['text' => $text, 'html' => '', 'item' => $ret];
 				Hook::callAll('email_getmessage', $message);
 				$ret = $message['item'];
-				$ret['body'] = $message['html'];
-
-				$ret['body'] = HTML::toBBCode($ret['body']);
+				$ret['body'] = $message['text'];
 			}
 		} else {
 			$text = '';
@@ -159,13 +178,13 @@ class Email
 			$message = ['text' => trim($text), 'html' => trim($html), 'item' => $ret];
 			Hook::callAll('email_getmessage', $message);
 			$ret = $message['item'];
-			$html = $message['html'];
-			$text = $message['text'];
 
-			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'];
 			}
 		}