Add 'addon' folder as 'Friendica\Addon' namespace for autoload

[friendica.git] / src / Protocol / Email.php

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index ee8c43eff8b77d8bce371eb1920127a148c70f54..87f4091e5ea02a2dcca3c5e1085fbe1657fa0eba 100644 (file)
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -4,7 +4,10 @@
  */
 namespace Friendica\Protocol;
 
-require_once 'include/html2plain.php';
+use Friendica\Core\Logger;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Protocol;
+use Friendica\Model\Item;
 
 /**
  * @brief Email class
@@ -25,6 +28,16 @@ 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;
        }
 
@@ -43,21 +56,21 @@ class Email
                if (!$search1) {
                        $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 = [];
                } 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 = [];
                } 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));
@@ -104,14 +117,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 = '';
@@ -128,7 +141,7 @@ class Email
                                }
                        }
                        if (trim($html) != '') {
-                               $ret['body'] = html2bbcode($html);
+                               $ret['body'] = HTML::toBBCode($html);
                        } else {
                                $ret['body'] = $text;
                        }
@@ -298,7 +311,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
@@ -319,7 +332,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";
@@ -328,7 +341,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";
@@ -340,7 +353,7 @@ class Email
 
                //$message = '<html><body>' . $html . '</body></html>';
                //$message = html2plain($html);
-               logger('notifier: email delivery to ' . $addr);
+               Logger::log('notifier: email delivery to ' . $addr);
                mail($addr, $subject, $body, $headers);
        }
 
@@ -469,13 +482,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;
                }
 
@@ -503,7 +514,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 {
@@ -534,7 +545,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) == '>') {
@@ -564,7 +575,7 @@ class Email
                                                (substr(rtrim($line), -7) == '[/size]'));
                        }
 
-                       if ($lines[$lineno] != '') {
+                       if (!empty($lines[$lineno])) {
                                if (substr($lines[$lineno], -1) != ' ') {
                                        $lines[$lineno] .= ' ';
                                }
@@ -574,13 +585,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);
        }
@@ -617,12 +630,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++;
                        }