X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=a6090ce91f6a75dd9101bec6927bf394749ec87a;hb=1f6e0f168ceafcd254403b40f752a21b82e8d923;hp=8acef9c388f2fc482d465008f4912de7e5a2e7d9;hpb=58df57df6e2fec4b0e2be1faee12f91082dbcf76;p=friendica.git diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index 8acef9c388..a6090ce91f 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -4,8 +4,9 @@ */ namespace Friendica\Protocol; -require_once 'include/html2plain.php'; -require_once 'include/quoteconvert.php'; +use Friendica\Core\Logger; +use Friendica\Content\Text\HTML; +use Friendica\Model\Item; /** * @brief Email class @@ -16,7 +17,8 @@ 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) { @@ -26,39 +28,50 @@ class Email $mbox = @imap_open($mailbox, $username, $password); + $errors = imap_errors(); + if (!empty($errors)) { + Logger::log('IMAP Errors occured: ' . json_encode($errors)); + } + + $alerts = imap_alerts(); + if (!empty($alerts)) { + Logger::log('IMAP Alerts occured: ' . json_encode($alerts)); + } + return $mbox; } /** - * @param object $mbox mailbox - * @param string $email_addr email + * @param resource $mbox mailbox + * @param string $email_addr email * @return array + * @throws \Exception */ 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); + Logger::log("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); + Logger::log("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); + Logger::log("Found mails cc ".$email_addr, Logger::DEBUG); } $res = array_unique(array_merge($search1, $search2, $search3)); @@ -67,8 +80,8 @@ class Email } /** - * @param array $mailacct mail account - * @return object + * @param array $mailacct mail account + * @return string */ public static function constructMailboxName($mailacct) { @@ -79,25 +92,26 @@ 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) { - $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 : []; } /** - * @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) { - $ret = array(); + $ret = []; $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null); @@ -105,14 +119,14 @@ class Email return $ret; } - if (!$struc->parts) { + if (empty($struc->parts)) { $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html'); $html = $ret['body']; 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 = ''; @@ -129,7 +143,7 @@ class Email } } if (trim($html) != '') { - $ret['body'] = html2bbcode($html); + $ret['body'] = HTML::toBBCode($html); } else { $ret['body'] = $text; } @@ -152,11 +166,11 @@ class Email // 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 + * @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) @@ -164,8 +178,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) @@ -180,7 +192,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; @@ -233,9 +245,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; } @@ -299,7 +308,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 @@ -309,6 +318,8 @@ class Email * * @return void * + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException * @todo This could be changed to use the Emailer class */ public static function send($addr, $subject, $headers, $item) @@ -320,7 +331,7 @@ class Email $part = uniqid("", true); - $html = prepare_body($item); + $html = Item::prepareBody($item); $headers .= "Mime-Version: 1.0\n"; $headers .= 'Content-Type: multipart/alternative; boundary="=_'.$part.'"'."\n\n"; @@ -329,7 +340,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"; @@ -341,7 +352,7 @@ class Email //$message = '' . $html . ''; //$message = html2plain($html); - logger('notifier: email delivery to ' . $addr); + Logger::log('notifier: email delivery to ' . $addr); mail($addr, $subject, $body, $headers); } @@ -389,7 +400,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); @@ -470,13 +481,11 @@ class Email '[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'. '[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is'; - preg_match($pattern, $message, $result); - - $cleaned = trim($result[1].$result[2].$result[3]); + if (preg_match($pattern, $message, $result)) { + $cleaned = trim($result[1].$result[2].$result[3]); - $cleaned = str_replace(array("\n- --\n", "\n- -"), array("\n-- \n", "\n-"), $cleaned); - - if ($cleaned == '') { + $cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned); + } else { $cleaned = $message; } @@ -497,14 +506,14 @@ 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'; preg_match($pattern, $message, $result); - if (($result[1] != '') && ($result[2] != '')) { + if (!empty($result[1]) && !empty($result[2])) { $cleaned = trim($result[1])."\n"; $sig = trim($result[2]); } else { @@ -512,14 +521,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) { @@ -535,7 +544,7 @@ class Email } $quotelevel = 0; - $nextline = trim($arrbody[$i+1]); + $nextline = trim(defaults($arrbody, $i + 1, '')); while ((strlen($nextline)>0) && ((substr($nextline, 0, 1) == '>') || (substr($nextline, 0, 1) == ' '))) { if (substr($nextline, 0, 1) == '>') { @@ -545,27 +554,7 @@ 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 ($lines[$lineno] != '') { + if (!empty($lines[$lineno])) { if (substr($lines[$lineno], -1) != ' ') { $lines[$lineno] .= ' '; } @@ -575,13 +564,15 @@ class Email $line = ltrim(substr($line, 1)); } + } else { + $lines[$lineno] = ''; } $lines[$lineno] .= $line; if (((substr($line, -1, 1) != ' ')) || ($quotelevel != $currquotelevel)) { $lineno++; - } + } } return implode("\n", $lines); } @@ -590,7 +581,7 @@ class Email { // Convert Quotes $arrbody = explode("\n", trim($body)); - $arrlevel = array(); + $arrlevel = []; for ($i = 0; $i < count($arrbody); $i++) { $quotelevel = 0; @@ -609,21 +600,14 @@ class Email } $quotelevel = 0; - $previousquote = 0; - $arrbodyquoted = array(); + $arrbodyquoted = []; for ($i = 0; $i < count($arrbody); $i++) { $previousquote = $quotelevel; $quotelevel = $arrlevel[$i]; - $currline = $arrbody[$i]; while ($previousquote < $quotelevel) { - if ($sender != '') { - $quote = "[quote title=$sender]"; - $sender = ''; - } else - $quote = "[quote]"; - + $quote = "[quote]"; $arrbody[$i] = $quote.$arrbody[$i]; $previousquote++; } @@ -663,7 +647,7 @@ class Email $message = str_replace("[/quote][quote]", "", $message); } while ($message != $oldmessage); - $quotes = array(); + $quotes = []; $startquotes = 0;