X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FEmail.php;h=00122e2eaeb3781b6463aaafb3c9b61815a3962f;hb=3a74f3364d28297ba957544893d9c721d683dba1;hp=fadd124c961e43b2e32f7228fcde380cb3e63426;hpb=b5666bd27ffcc9b270ea7f1fffe1001a96d8d72b;p=friendica.git diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index fadd124c96..00122e2eae 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -5,8 +5,7 @@ namespace Friendica\Protocol; use Friendica\Content\Text\HTML; - -require_once 'include/html2plain.php'; +use Friendica\Core\Protocol; /** * @brief Email class @@ -27,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; } @@ -300,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 @@ -330,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";