Changeset 1401 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

09/11/09 16:26:07 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #528 - Corrigido problemas de charset no campo subject.

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -196 +196 @@
                 else if (strpos(strtolower($string), '=?utf-8') !== false)
                 {
-                        $elements = imap_mime_header_decode($string);                   
-                        for($i = 0;$i < count($elements);$i++) {
+                        $elements = imap_mime_header_decode($string);
+
+                        for($i = 0;$i < count($elements);$i++)
+                        {
                                 $charset = strtolower($elements[$i]->charset);
-                                $text =$elements[$i]->text;
-                                if(!strcasecmp($charset, "utf-8") ||
-                                !strcasecmp($charset, "utf-7")) {
+                                $text = $elements[$i]->text;
+
+                                if(!strcasecmp($charset, "utf-8") || !strcasecmp($charset, "utf-7"))
+                                {
                                 $decoded .= $this->functions->utf8_to_ncr($text);
                         }
                                 else
-                                        $decoded .= $this->htmlspecialchars_encode(iconv($charset, "iso-8859-1", $text));
+                                {
+                                        if( strcasecmp($charset,"default") )
+                                                $decoded .= $this->htmlspecialchars_encode(iconv($charset, "iso-8859-1", $text));
+                                        else
+                                                $decoded .= $this->htmlspecialchars_encode($text);
+                                }
                         }
                         return $decoded;