ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong...

ZP-1172 Some mails bodies or headers in Japanese may be decoded in wrong encoding. Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/imap/imap.php

@@ -1030,12 +1030,8 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
             $mobj = new Mail_mimeDecode($mail);
             $message = $mobj->decode(array('decode_headers' => true, 'decode_bodies' => true, 'include_bodies' => true, 'rfc_822bodies' => true, 'charset' => 'utf-8'));
 
-            if ( strpos($message->headers["subject"], chr(0x1b).'$B') !== false ) {
-                $message->headers["subject"] = mb_convert_encoding($message->headers["subject"], "utf-8", "ISO-2022-JP-MS");
-            }
-            if ( strpos($message->headers["from"], chr(0x1b).'$B') !== false ) {
-                $message->headers["from"] = mb_convert_encoding($message->headers["from"], "utf-8", "ISO-2022-JP-MS");
-            }
+            Utils::CheckAndFixEncoding($message->headers["subject"]);
+            Utils::CheckAndFixEncoding($message->headers["from"]);
 
             $is_multipart = is_multipart($message);
             $is_smime = is_smime($message);
@@ -1077,9 +1073,7 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
             if (Request::GetProtocolVersion() >= 12.0) {
                 $output->asbody = new SyncBaseBody();
 
-                if ( strpos($textBody, chr(0x1b).'$B') !== false ) {
-                    $textBody = mb_convert_encoding($textBody, "utf-8", "ISO-2022-JP-MS");
-                }
+                Utils::CheckAndFixEncoding($textBody);
 
                 $data = "";
                 switch($bpReturnType) {

src/backend/imap/mime_encode.php

@@ -143,9 +143,7 @@ function change_charset_and_add_subparts(&$email, $part) {
         if (isset($part->ctype_parameters['charset'])) {
             $part->ctype_parameters['charset'] = 'UTF-8';
 
-            if ( isset($part->body) && strpos($part->body, chr(0x1b).'$B') !== false ) {
-                $part->body = mb_convert_encoding($part->body, "utf-8", "ISO-2022-JP-MS");
-            }
+            Utils::CheckAndFixEncoding($part->body);
 
             $new_part = add_sub_part($email, $part);
         }
@@ -238,9 +236,7 @@ function build_mime_message($message) {
         }
     }
 
-    if ( isset($message->body) && strpos($message->body, chr(0x1b).'$B') !== false ) {
-        $message->body = mb_convert_encoding($message->body, "utf-8", "ISO-2022-JP-MS");
-    }
+    Utils::CheckAndFixEncoding($message->body);
 
     $finalEmail = new Mail_mimePart(isset($message->body) ? $message->body : "", $mimeHeaders);
     unset($mimeHeaders);

src/backend/maildir/maildir.php

@@ -335,12 +335,8 @@ class BackendMaildir extends BackendDiff {
 
         $message = Mail_mimeDecode::decode(array('decode_headers' => true, 'decode_bodies' => true, 'include_bodies' => true, 'input' => $rfc822, 'crlf' => "\n", 'charset' => 'utf-8'));
 
-        if ( strpos($message->headers["subject"], chr(0x1b).'$B') !== false ) {
-            $message->headers["subject"] = mb_convert_encoding($message->headers["subject"], "utf-8", "ISO-2022-JP-MS");
-        }
-        if ( strpos($message->headers["from"], chr(0x1b).'$B') !== false ) {
-            $message->headers["from"] = mb_convert_encoding($message->headers["from"], "utf-8", "ISO-2022-JP-MS");
-        }
+        Utils::CheckAndFixEncoding($message->headers["subject"]);
+        Utils::CheckAndFixEncoding($message->headers["from"]);
 
         $output = new SyncMail();
 

src/lib/utils/utils.php

@@ -1175,6 +1175,21 @@ class Utils {
     public static function IsFolderToBeProcessedByKoe($folder) {
         return isset($folder->displayname) && substr($folder->displayname, -3) == hex2bin("e2808b");
     }
+
+    /**
+     * Check if the UTF-8 string has ISO-2022-JP esc seq 
+     * if so, it is ISO-2022-JP, not UTF-8 and convert it into UTF-8
+     * string
+     *
+     * @access public
+     * @param $string
+     * @return $string
+     */
+    public static function CheckAndFixEncoding(&$string) {
+        if ( isset($string) && strpos($string, chr(0x1b).'$B') !== false ) {
+            $string = mb_convert_encoding($string, "utf-8", "ISO-2022-JP-MS");
+        }
+    }
 }