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

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index dd9230fbd3..06946d4830 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -1,15 +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
 {
@@ -17,7 +37,7 @@ class Email
 	 * @param string $mailbox  The mailbox name
 	 * @param string $username The username
 	 * @param string $password The password
-	 * @return object
+	 * @return resource
 	 * @throws \Exception
 	 */
 	public static function connect($mailbox, $username, $password)
@@ -42,8 +62,8 @@ class Email
 	}
 
 	/**
-	 * @param object $mbox       mailbox
-	 * @param string $email_addr email
+	 * @param resource $mbox       mailbox
+	 * @param string   $email_addr email
 	 * @return array
 	 * @throws \Exception
 	 */
@@ -53,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 {
@@ -92,8 +112,8 @@ class Email
 	}
 
 	/**
-	 * @param object  $mbox mailbox
-	 * @param integer $uid  user id
+	 * @param resource $mbox mailbox
+	 * @param integer  $uid  user id
 	 * @return mixed
 	 */
 	public static function messageMeta($mbox, $uid)
@@ -103,30 +123,42 @@ class Email
 	}
 
 	/**
-	 * @param object  $mbox  mailbox
-	 * @param integer $uid   user id
-	 * @param string  $reply reply
+	 * @param resource $mbox  mailbox
+	 * @param integer  $uid   user id
+	 * @param string   $reply reply
 	 * @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 (!empty($html)) {
+				$message = ['text' => '', 'html' => $html, 'item' => $ret];
+				Hook::callAll('email_getmessage', $message);
+				$ret = $message['item'];
+				if (empty($ret['body'])) {
+					$ret['body'] = HTML::toBBCode($message['html']);
+				}
+			}
 
-			if (trim($ret['body']) == '') {
-				$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
-			} else {
-				$ret['body'] = HTML::toBBCode($ret['body']);
+			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['text'];
 			}
 		} else {
 			$text = '';
@@ -142,10 +174,17 @@ class Email
 					$html .= $x;
 				}
 			}
-			if (trim($html) != '') {
-				$ret['body'] = HTML::toBBCode($html);
-			} else {
-				$ret['body'] = $text;
+
+			$message = ['text' => trim($text), 'html' => trim($html), 'item' => $ret];
+			Hook::callAll('email_getmessage', $message);
+			$ret = $message['item'];
+
+			if (empty($ret['body']) && !empty($message['html'])) {
+				$ret['body'] = HTML::toBBCode($message['html']);
+			}
+
+			if (empty($ret['body'])) {
+				$ret['body'] = $message['text'];
 			}
 		}
 
@@ -160,17 +199,22 @@ 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;
 	}
 
-	// At the moment - only return plain/text.
-	// Later we'll repackage inline images as data url's and make the HTML safe
 	/**
-	 * @param object  $mbox    mailbox
-	 * @param integer $uid     user id
-	 * @param object  $p       parts
-	 * @param integer $partno  part number
-	 * @param string  $subtype sub type
+	 * fetch the specified message part number with the specified subtype
+	 *
+	 * @param resource $mbox    mailbox
+	 * @param integer  $uid     user id
+	 * @param object   $p       parts
+	 * @param integer  $partno  part number
+	 * @param string   $subtype sub type
 	 * @return string
 	 */
 	private static function messageGetPart($mbox, $uid, $p, $partno, $subtype)
@@ -178,8 +222,6 @@ class Email
 		// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
 		global $htmlmsg,$plainmsg,$charset,$attachments;
 
-		//echo $partno."\n";
-
 		// DECODE DATA
 		$data = ($partno)
 			? @imap_fetchbody($mbox, $uid, $partno, FT_UID|FT_PEEK)
@@ -247,9 +289,6 @@ class Email
 			$x = "";
 			foreach ($p->parts as $partno0 => $p2) {
 				$x .=  self::messageGetPart($mbox, $uid, $p2, $partno . '.' . ($partno0+1), $subtype);  // 1.2, 1.2.1, etc.
-				//if ($x) {
-				//	return $x;
-				//}
 			}
 			return $x;
 		}
@@ -313,7 +352,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
@@ -549,7 +588,7 @@ class Email
 			}
 
 			$quotelevel = 0;
-			$nextline = trim(defaults($arrbody, $i + 1, ''));
+			$nextline = trim($arrbody[$i + 1] ?? '');
 			while ((strlen($nextline)>0) && ((substr($nextline, 0, 1) == '>')
 				|| (substr($nextline, 0, 1) == ' '))) {
 				if (substr($nextline, 0, 1) == '>') {
@@ -559,26 +598,6 @@ class Email
 				$nextline = ltrim(substr($nextline, 1));
 			}
 
-			$firstword = strpos($nextline.' ', ' ');
-
-			$specialchars = ((substr(trim($nextline), 0, 1) == '-') ||
-					(substr(trim($nextline), 0, 1) == '=') ||
-					(substr(trim($nextline), 0, 1) == '*') ||
-					(substr(trim($nextline), 0, 1) == '·') ||
-					(substr(trim($nextline), 0, 4) == '[url') ||
-					(substr(trim($nextline), 0, 5) == '[size') ||
-					(substr(trim($nextline), 0, 7) == 'http://') ||
-					(substr(trim($nextline), 0, 8) == 'https://'));
-
-			if (!$specialchars) {
-				$specialchars = ((substr(rtrim($line), -1) == '-') ||
-						(substr(rtrim($line), -1) == '=') ||
-						(substr(rtrim($line), -1) == '*') ||
-						(substr(rtrim($line), -1) == '·') ||
-						(substr(rtrim($line), -6) == '[/url]') ||
-						(substr(rtrim($line), -7) == '[/size]'));
-			}
-
 			if (!empty($lines[$lineno])) {
 				if (substr($lines[$lineno], -1) != ' ') {
 					$lines[$lineno] .= ' ';
@@ -625,13 +644,11 @@ class Email
 		}
 
 		$quotelevel = 0;
-		$previousquote = 0;
 		$arrbodyquoted = [];
 
 		for ($i = 0; $i < count($arrbody); $i++) {
 			$previousquote = $quotelevel;
 			$quotelevel = $arrlevel[$i];
-			$currline = $arrbody[$i];
 
 			while ($previousquote < $quotelevel) {
 				$quote = "[quote]";