Changeset 7698 for trunk

Timestamp:

01/02/13 11:00:10 (11 years ago)

Author:

cristiano

Message:

Ticket #3209 - Codificação de emails com problema

File:

• trunk/zpush/backend/expresso/providers/imapProvider.php (modified) (1 diff)

trunk/zpush/backend/expresso/providers/imapProvider.php

@@ -1602 +1602 @@
         if(!isset($message->ctype_primary)) return;
         if(strcasecmp($message->ctype_primary,"text")==0 && strcasecmp($message->ctype_secondary,$subtype)==0 && isset($message->body)){
-          $body .= (strtolower($message->ctype_parameters['charset']) == 'iso-8859-1' ) ? mb_convert_encoding($message->body, "UTF-8","ISO-8859-1,UTF-8") : $message->body;
+
+            if(strtolower($message->ctype_parameters['charset']) == 'iso-8859-1')
+            {
+                $body .=  mb_detect_encoding($message->body) == 'UTF-8' ? $message->body : mb_convert_encoding($message->body , 'ISO-8859-1');
+            }
+            else
+            {
+                $body .= $message->body;
+            }
          }