X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=db22b76973b736ef86f9ecb6a591aca081771c07;hb=c0b3c527d62dfce01df56edd7ffafc51d83ddaf5;hp=09b9df05063a965bebdef4cb455ebab264e499d4;hpb=84244b1450380ce1fe8d06b9a5ac9693e0ed2391;p=friendica.git diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index 09b9df0506..db22b76973 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -1,7 +1,24 @@ . + * */ + namespace Friendica\Protocol; use Friendica\Core\Hook; @@ -10,9 +27,10 @@ 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 { @@ -20,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) @@ -33,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)); @@ -95,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) @@ -106,40 +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, $item) + public static function getMessage($mbox, $uid, $reply, $item): array { $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']; - - if (trim($ret['body']) == '') { - $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain'); + $html = trim(self::messageGetPart($mbox, $uid, $struc, 0, 'html')); - $message = ['text' => $ret['body'], 'html' => '', 'item' => $ret]; + if (!empty($html)) { + $message = ['text' => '', 'html' => $html, 'item' => $ret]; Hook::callAll('email_getmessage', $message); $ret = $message['item']; - $ret['body'] = $message['text']; - } else { - $message = ['text' => '', 'html' => $ret['body'], 'item' => $ret]; + if (empty($ret['body'])) { + $ret['body'] = HTML::toBBCode($message['html']); + } + } + + if (empty($ret['body'])) { + $text = self::messageGetPart($mbox, $uid, $struc, 0, 'plain'); + + $message = ['text' => $text, 'html' => '', 'item' => $ret]; Hook::callAll('email_getmessage', $message); $ret = $message['item']; - $ret['body'] = $message['html']; - - $ret['body'] = HTML::toBBCode($ret['body']); + $ret['body'] = $message['text']; } } else { $text = ''; @@ -159,13 +179,13 @@ class Email $message = ['text' => trim($text), 'html' => trim($html), 'item' => $ret]; Hook::callAll('email_getmessage', $message); $ret = $message['item']; - $html = $message['html']; - $text = $message['text']; - 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']; } } @@ -191,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) @@ -377,7 +397,7 @@ class Email //$message = '' . $html . ''; //$message = html2plain($html); - Logger::log('notifier: email delivery to ' . $addr); + Logger::notice('notifier: email delivery to ' . $addr); mail($addr, $subject, $body, $headers); }