X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=a6090ce91f6a75dd9101bec6927bf394749ec87a;hb=95827140891f45646ab53c6a850a3ea2389ce6e9;hp=5dba94ee5ab8b72ee6daf91d76201f523b5bb7ea;hpb=14fde5dc9b1915392601fb94efc6224c01f2b216;p=friendica.git diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index 5dba94ee5a..a6090ce91f 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -6,7 +6,7 @@ namespace Friendica\Protocol; use Friendica\Core\Logger; use Friendica\Content\Text\HTML; -use Friendica\Core\Protocol; +use Friendica\Model\Item; /** * @brief Email class @@ -17,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) { @@ -41,9 +42,10 @@ class Email } /** - * @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) { @@ -55,21 +57,21 @@ class Email if (!$search1) { $search1 = []; } else { - Logger::log("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 = []; } else { - Logger::log("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 = []; } else { - Logger::log("Found mails cc ".$email_addr, LOGGER_DEBUG); + Logger::log("Found mails cc ".$email_addr, Logger::DEBUG); } $res = array_unique(array_merge($search1, $search2, $search3)); @@ -90,8 +92,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) @@ -101,10 +103,11 @@ 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) { @@ -116,7 +119,7 @@ class Email return $ret; } - if (!$struc->parts) { + if (empty($struc->parts)) { $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html'); $html = $ret['body']; @@ -163,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) @@ -175,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) @@ -244,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; } @@ -320,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) @@ -331,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"; @@ -481,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(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned); - - if ($cleaned == '') { + $cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned); + } else { $cleaned = $message; } @@ -515,7 +513,7 @@ class Email 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 { @@ -546,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) == '>') { @@ -556,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] .= ' '; } @@ -586,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); } @@ -620,13 +600,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]";