X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=db22b76973b736ef86f9ecb6a591aca081771c07;hb=065d73f860e40e5e3c0646a39edd30997d34f72e;hp=3df39af00719e80da3b7f41dd7fb5fa417c6b7cd;hpb=97dddf91b7c7d5b2a60a29ed198bfb50650c2936;p=friendica.git

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 3df39af007..db22b76973 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -1,16 +1,36 @@
 <?php
 /**
- * @file src/Protocol/Email.php
+ * @copyright Copyright (C) 2010-2022, 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;
 use Friendica\Core\Logger;
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Model\Item;
+use Friendica\Util\Strings;
+use \IMAP\Connection;
 
 /**
- * @brief Email class
+ * Email class
  */
 class Email
 {
@@ -18,7 +38,7 @@ class Email
 	 * @param string $mailbox  The mailbox name
 	 * @param string $username The username
 	 * @param string $password The password
-	 * @return resource
+	 * @return Connection|resource
 	 * @throws \Exception
 	 */
 	public static function connect($mailbox, $username, $password)
@@ -31,48 +51,48 @@ class Email
 
 		$errors = imap_errors();
 		if (!empty($errors)) {
-			Logger::log('IMAP Errors occured: ' . json_encode($errors));
+			Logger::notice('IMAP Errors occured', ['errors' => $errors]);
 		}
 
 		$alerts = imap_alerts();
 		if (!empty($alerts)) {
-			Logger::log('IMAP Alerts occured: ' . json_encode($alerts));
+			Logger::notice('IMAP Alerts occured: ', ['alerts' => $alerts]);
 		}
 
 		return $mbox;
 	}
 
 	/**
-	 * @param resource $mbox       mailbox
-	 * @param string   $email_addr email
+	 * @param Connection|resource $mbox       mailbox
+	 * @param string              $email_addr email
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function poll($mbox, $email_addr)
+	public static function poll($mbox, $email_addr): array
 	{
 		if (!$mbox || !$email_addr) {
 			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);
+			Logger::notice("Found mails from ".$email_addr);
 		}
 
-		$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);
+			Logger::notice("Found mails to ".$email_addr);
 		}
 
-		$search3 = @imap_search($mbox, 'CC "' . $email_addr . '"', SE_UID);
+		$search3 = @imap_search($mbox, 'UNDELETED CC "' . $email_addr . '"', SE_UID);
 		if (!$search3) {
 			$search3 = [];
 		} else {
-			Logger::log("Found mails cc ".$email_addr, Logger::DEBUG);
+			Logger::notice("Found mails cc ".$email_addr);
 		}
 
 		$res = array_unique(array_merge($search1, $search2, $search3));
@@ -93,8 +113,8 @@ class Email
 	}
 
 	/**
-	 * @param resource $mbox mailbox
-	 * @param integer  $uid  user id
+	 * @param Connection|resource $mbox mailbox
+	 * @param integer             $uid  user id
 	 * @return mixed
 	 */
 	public static function messageMeta($mbox, $uid)
@@ -104,34 +124,42 @@ class Email
 	}
 
 	/**
-	 * @param resource $mbox  mailbox
-	 * @param integer  $uid   user id
-	 * @param string   $reply reply
+	 * @param Connection|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): array
 	{
-		$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 +176,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 +200,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;
@@ -179,11 +211,11 @@ class Email
 	/**
 	 * 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
+	 * @param Connection|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)
@@ -321,7 +353,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
@@ -365,7 +397,7 @@ class Email
 
 		//$message = '<html><body>' . $html . '</body></html>';
 		//$message = html2plain($html);
-		Logger::log('notifier: email delivery to ' . $addr);
+		Logger::notice('notifier: email delivery to ' . $addr);
 		mail($addr, $subject, $body, $headers);
 	}