Changeset 4773

Timestamp:

07/15/11 16:36:36 (13 years ago)

Author:

airton

Message:

Ticket #828 - Problema de codificacao na exibicao de assunto de mensagem

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

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

@@ -306 +306 @@
               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"))
-                   {
-                       $decoded .= $this->functions->utf8_to_ncr($text);
-                   }
+                                        $charset = strtolower($elements[$i]->charset); 
+                                        $text = $elements[$i]->text; 
+                                        if(!strcasecmp($charset, "utf-8") || !strcasecmp($charset, "utf-7"))
+                                                $decoded .= $this->functions->utf8_to_ncr($text);
                   else
                   {
@@ -324 +321 @@
               return str_replace("\t", "", $decoded);
         }
+                else if(strpos(strtolower($string), '=?us-ascii') !== false) 
+           { 
+                        $retun = ''; 
+                        $tmp = imap_mime_header_decode($string); 
+                        foreach ($tmp as $tmp1) 
+                                $return .= $this->htmlspecialchars_encode(quoted_printable_decode($tmp1->text)); 
+                
+                        return str_replace("\t", "", $return); 
+         
+            }
         else if (eregi('=?', $string))
-        {
             return iconv_mime_decode($string);
-        }
+        
 
         return $this->htmlspecialchars_encode($string);