Issue 3326: We are now completely working with utf8mb4

[friendica.git] / include / email.php

diff --git a/include/email.php b/include/email.php
index dec8c93db7aa519dcfae0711b2bccb0b5f744593..42f80c24273e2c6d4aaf1c894259504ab0fbf49b 100644 (file)
--- a/include/email.php
+++ b/include/email.php
@@ -96,15 +96,20 @@ function email_get_msg($mbox,$uid, $reply) {
                $html = '';
                foreach($struc->parts as $ptop => $p) {
                        $x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
-                       if($x)  $text .= $x;
+                       if ($x) {
+                               $text .= $x;
+                       }
 
                        $x = email_get_part($mbox,$uid,$p,$ptop + 1, 'html');
-                       if($x)  $html .= $x;
+                       if ($x) {
+                               $html .= $x;
+                       }
                }
-               if (trim($html) != '')
+               if (trim($html) != '') {
                        $ret['body'] = html2bbcode($html);
-               else
+               } else {
                        $ret['body'] = $text;
+               }
        }
 
        $ret['body'] = removegpg($ret['body']);
@@ -112,8 +117,9 @@ function email_get_msg($mbox,$uid, $reply) {
        $ret['body'] = $msg['body'];
        $ret['body'] = convertquote($ret['body'], $reply);
 
-       if (trim($html) != '')
+       if (trim($html) != '') {
                $ret['body'] = removelinebreak($ret['body']);
+       }
 
        $ret['body'] = unifyattributionline($ret['body']);
 
@@ -189,8 +195,9 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
                $x = "";
                foreach ($p->parts as $partno0=>$p2) {
                        $x .=  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype);  // 1.2, 1.2.1, etc.
-                       //if($x)
+                       //if ($x) {
                        //      return $x;
+                       //}
                }
                return $x;
        }
@@ -249,6 +256,12 @@ function email_header_encode($in_str, $charset) {
     return $out_str;
 }
 
+/**
+ * email_send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
+ * (not to notify the user, but to send items to email contacts)
+ *
+ * @todo This could be changed to use the Emailer class
+ */
 function email_send($addr, $subject, $headers, $item) {
        //$headers .= 'MIME-Version: 1.0' . "\n";
        //$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";