X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=00122e2eaeb3781b6463aaafb3c9b61815a3962f;hb=0ebfa6fc123916754585625ae2823fbb5160840f;hp=89f7808c9986e30bda4b8c074c109e16a61e537b;hpb=1cc39e7fb41a9b8e1eb0c6463e74e06a3c84a5ad;p=friendica.git

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 89f7808c99..00122e2eae 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -4,7 +4,8 @@
  */
 namespace Friendica\Protocol;
 
-require_once 'include/html2plain.php';
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Protocol;
 
 /**
  * @brief Email class
@@ -25,6 +26,16 @@ class Email
 
 		$mbox = @imap_open($mailbox, $username, $password);
 
+		$errors = imap_errors();
+		if (!empty($errors)) {
+			logger('IMAP Errors occured: ' . json_encode($errors));
+		}
+
+		$alerts = imap_alerts();
+		if (!empty($alerts)) {
+			logger('IMAP Alerts occured: ' . json_encode($alerts));
+		}
+
 		return $mbox;
 	}
 
@@ -36,26 +47,26 @@ class Email
 	public static function poll($mbox, $email_addr)
 	{
 		if (!$mbox || !$email_addr) {
-			return array();
+			return [];
 		}
 
 		$search1 = @imap_search($mbox, 'FROM "' . $email_addr . '"', SE_UID);
 		if (!$search1) {
-			$search1 = array();
+			$search1 = [];
 		} else {
 			logger("Found mails from ".$email_addr, LOGGER_DEBUG);
 		}
 
 		$search2 = @imap_search($mbox, 'TO "' . $email_addr . '"', SE_UID);
 		if (!$search2) {
-			$search2 = array();
+			$search2 = [];
 		} else {
 			logger("Found mails to ".$email_addr, LOGGER_DEBUG);
 		}
 
 		$search3 = @imap_search($mbox, 'CC "' . $email_addr . '"', SE_UID);
 		if (!$search3) {
-			$search3 = array();
+			$search3 = [];
 		} else {
 			logger("Found mails cc ".$email_addr, LOGGER_DEBUG);
 		}
@@ -84,8 +95,8 @@ class Email
 	 */
 	public static function messageMeta($mbox, $uid)
 	{
-		$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox, $uid, FT_UID) : array(array())); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
-		return (count($ret)) ? $ret : array();
+		$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox, $uid, FT_UID) : [[]]); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
+		return (count($ret)) ? $ret : [];
 	}
 
 	/**
@@ -96,7 +107,7 @@ class Email
 	 */
 	public static function getMessage($mbox, $uid, $reply)
 	{
-		$ret = array();
+		$ret = [];
 
 		$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null);
 
@@ -111,7 +122,7 @@ class Email
 			if (trim($ret['body']) == '') {
 				$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
 			} else {
-				$ret['body'] = html2bbcode($ret['body']);
+				$ret['body'] = HTML::toBBCode($ret['body']);
 			}
 		} else {
 			$text = '';
@@ -128,7 +139,7 @@ class Email
 				}
 			}
 			if (trim($html) != '') {
-				$ret['body'] = html2bbcode($html);
+				$ret['body'] = HTML::toBBCode($html);
 			} else {
 				$ret['body'] = $text;
 			}
@@ -179,7 +190,7 @@ class Email
 
 		// PARAMETERS
 		// get all parameters, like charset, filenames of attachments, etc.
-		$params = array();
+		$params = [];
 		if ($p->parameters) {
 			foreach ($p->parameters as $x) {
 				$params[strtolower($x->attribute)] = $x->value;
@@ -298,7 +309,7 @@ class Email
 	}
 
 	/**
-	 * Function send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
+	 * Function send is used by Protocol::EMAIL and Protocol::EMAIL2 code
 	 * (not to notify the user, but to send items to email contacts)
 	 *
 	 * @param string $addr    address
@@ -328,7 +339,7 @@ class Email
 		$body .= "Content-Transfer-Encoding: 8bit\n";
 		$body .= "Content-Type: text/plain; charset=utf-8; format=flowed\n\n";
 
-		$body .= html2plain($html)."\n";
+		$body .= HTML::toPlaintext($html)."\n";
 
 		$body .= "--=_".$part."\n";
 		$body .= "Content-Transfer-Encoding: 8bit\n";
@@ -388,7 +399,7 @@ class Email
 
 	private static function unifyAttributionLine($message)
 	{
-		$quotestr = array('quote', 'spoiler');
+		$quotestr = ['quote', 'spoiler'];
 		foreach ($quotestr as $quote) {
 			$message = self::saveReplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Cc: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
 			$message = self::saveReplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
@@ -473,7 +484,7 @@ class Email
 
 		$cleaned = trim($result[1].$result[2].$result[3]);
 
-		$cleaned = str_replace(array("\n- --\n", "\n- -"), array("\n-- \n", "\n-"), $cleaned);
+		$cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned);
 
 		if ($cleaned == '') {
 			$cleaned = $message;
@@ -496,7 +507,7 @@ class Email
 
 		// When the signature separator is inside a quote, we don't separate
 		if (($sigpos < $quotepos) && ($sigpos != 0)) {
-			return array('body' => $message, 'sig' => '');
+			return ['body' => $message, 'sig' => ''];
 		}
 
 		$pattern = '/(.*)[\r\n]-- [\r\n](.*)/is';
@@ -511,14 +522,14 @@ class Email
 			$sig = '';
 		}
 
-		return array('body' => $cleaned, 'sig' => $sig);
+		return ['body' => $cleaned, 'sig' => $sig];
 	}
 
 	private static function removeLinebreak($message)
 	{
 		$arrbody = explode("\n", trim($message));
 
-		$lines = array();
+		$lines = [];
 		$lineno = 0;
 
 		foreach ($arrbody as $i => $line) {
@@ -589,7 +600,7 @@ class Email
 	{
 		// Convert Quotes
 		$arrbody = explode("\n", trim($body));
-		$arrlevel = array();
+		$arrlevel = [];
 
 		for ($i = 0; $i < count($arrbody); $i++) {
 			$quotelevel = 0;
@@ -609,7 +620,7 @@ class Email
 
 		$quotelevel = 0;
 		$previousquote = 0;
-		$arrbodyquoted = array();
+		$arrbodyquoted = [];
 
 		for ($i = 0; $i < count($arrbody); $i++) {
 			$previousquote = $quotelevel;
@@ -617,12 +628,7 @@ class Email
 			$currline = $arrbody[$i];
 
 			while ($previousquote < $quotelevel) {
-				if ($sender != '') {
-					$quote = "[quote title=$sender]";
-					$sender = '';
-				} else
-					$quote = "[quote]";
-
+				$quote = "[quote]";
 				$arrbody[$i] = $quote.$arrbody[$i];
 				$previousquote++;
 			}
@@ -662,7 +668,7 @@ class Email
 			$message = str_replace("[/quote][quote]", "", $message);
 		} while ($message != $oldmessage);
 
-		$quotes = array();
+		$quotes = [];
 
 		$startquotes = 0;