X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=06946d4830795d9987d237ff83d19ef7f7a38cad;hb=cc8491223ec17bd12b7f37d5b2cc16b58184291e;hp=8e3edd78316d361877ce85adac2f6d88215683a4;hpb=37bdafcc964f1f94da51f0ff008eddecfba094a4;p=friendica.git

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 8e3edd7831..06946d4830 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -1,16 +1,35 @@
 <?php
 /**
- * @file src/Protocol/Email.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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;
 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
+ * Email class
  */
 class Email
 {
@@ -54,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 {
@@ -110,28 +129,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 +175,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 +199,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;