X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=f915e9f742b4385092c0e33bde6d5d1e4979cc82;hb=c371d2ec82c88864738e6ad0762b6307811b2579;hp=76797eb6e8cc53ca7ffddb29026c8ae2c3043740;hpb=e220698ea1e6fd54bafe658c53c40bda65942553;p=friendica.git

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 76797eb6e8..f915e9f742 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
 {
@@ -33,12 +50,12 @@ class Email
 
 		$errors = imap_errors();
 		if (!empty($errors)) {
-			Logger::log('IMAP Errors occured: ' . json_encode($errors));
+			Logger::notice('IMAP Errors occured', ['errora' => $errors]);
 		}
 
 		$alerts = imap_alerts();
 		if (!empty($alerts)) {
-			Logger::log('IMAP Alerts occured: ' . json_encode($alerts));
+			Logger::notice('IMAP Alerts occured: ', ['alerts' => $alerts]);
 		}
 
 		return $mbox;
@@ -56,25 +73,25 @@ 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);
+			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));
@@ -119,25 +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'];
+			$html = trim(self::messageGetPart($mbox, $uid, $struc, 0, 'html'));
 
-			if (trim($ret['body']) == '') {
-				$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
+			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']);
+				}
+			}
 
-				$message = ['text' => $ret['body'], 'html' => ''];
-				Hook::callAll('email_getmessage', $message, $ret);
-				$ret['body'] = $message['text'];
-			} else {
-				$message = ['text' => '', 'html' => $ret['body']];
-				Hook::callAll('email_getmessage', $message, $ret);
-				$ret['body'] = $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 = '';
@@ -154,15 +175,16 @@ class Email
 				}
 			}
 
-			$message = ['text' => trim($text), 'html' => trim($html)];
-			Hook::callAll('email_getmessage', $message, $ret);
-			$html = $message['html'];
-			$text = $message['text'];
+			$message = ['text' => trim($text), 'html' => trim($html), 'item' => $ret];
+			Hook::callAll('email_getmessage', $message);
+			$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'];
 			}
 		}
 
@@ -374,7 +396,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);
 	}