ZP-869 utf-7 charset conversion: some folders are not shown.Released under the...

ZP-869 utf-7 charset conversion: some folders are not shown.Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/imap/imap.php

@@ -201,7 +201,7 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
         }
         unset($Mail_RFC822);
 
-        if (isset($message->headers["subject"]) and mb_detect_encoding($message->headers["subject"], "UTF-8") != FALSE and preg_match('/[^\x00-\x7F]/', $message->headers["subject"]) == 1) {
+        if (isset($message->headers["subject"]) && mb_detect_encoding($message->headers["subject"], "UTF-8") != false && preg_match('/[^\x00-\x7F]/', $message->headers["subject"]) == 1) {
             mb_internal_encoding("UTF-8");
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->SendMail(): Subject in raw UTF-8: %s", $message->headers["subject"]));
             $message->headers["subject"] = mb_encode_mimeheader($message->headers["subject"]);

src/lib/utils/utils.php

@@ -521,8 +521,6 @@ class Utils {
     static public function Utf7imap_to_utf8($string) {
         if (function_exists("mb_convert_encoding")){
             return @mb_convert_encoding($string, "UTF-8", "UTF7-IMAP");
-        } else {
-            ZLog::Write(LOGLEVEL_WARN, "Utils::Utf7imap_to_utf8() 'mb_convert_encoding' is not available. Charset conversion skipped.");
         }
         return $string;
     }
@@ -556,8 +554,6 @@ class Utils {
     static public function Utf8_to_utf7imap($string) {
         if (function_exists("mb_convert_encoding")){
             return @mb_convert_encoding($string, "UTF7-IMAP", "UTF-8");
-        } else {
-            ZLog::Write(LOGLEVEL_WARN, "Utils::Utf7imap_to_utf8() 'mb_convert_encoding' is not available. Charset conversion skipped.");
         }
         return $string;
     }