Changeset 1384

Timestamp:

09/01/09 14:59:15 (15 years ago)

Author:

niltonneto

Message:

Ticket #528 - Adição de novo método para correção desse ticket.

Location:

trunk/expressoMail1_2/inc

Files:

• class.functions.inc.php (modified) (2 diffs)
• class.imap_functions.inc.php (modified) (5 diffs)

trunk/expressoMail1_2/inc/class.functions.inc.php

@@ -1 +1 @@
 <?php
         class Functions{
-                
-                
                 function CallVoipConnect($params){
                         $fromNumber = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number'];
@@ -112 +110 @@
                         return $_SESSION['phpgw_info']['user']['preferences']['expressoMail'];
                 }
-        }
+                // Unicode Conversor: convert everything from UTF-8 into an NCR[Numeric Character Reference]
+                function utf8_to_ncr($content)  {
+            $result = "";            
+            while ($strlen = mb_strlen($content)) {
+                $c = mb_substr($content, 0, 1, "UTF-8");
+                $h = ord($c{0});   
+                    if ($h <= 0x7F || $h < 0xC2) {
+                        $result .= $c;
+                    }
+                        else if ($h <= 0xDF) {
+                        $h = ($h & 0x1F) << 6 | (ord($c{1}) & 0x3F);
+                        $result .= "&#" . $h . ";";
+                    } else if ($h <= 0xEF) {
+                        $h = ($h & 0x0F) << 12 | (ord($c{1}) & 0x3F) << 6 | (ord($c{2}) & 0x3F);
+                        $result .= "&#" . $h . ";";
+                    } else if ($h <= 0xF4) {
+                        $h = ($h & 0x0F) << 18 | (ord($c{1}) & 0x3F) << 12 | (ord($c{2}) & 0x3F) << 6 | (ord($c{3}) & 0x3F);
+                        $result .= "&#" . $h . ";";
+                    }                
+                $content = mb_substr( $content, 1, $strlen, "UTF-8");
+            }
+            return mb_convert_encoding($result,"UTF-8");
+        }
+    }   
 ?>

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

@@ -162 +162 @@
                 $from = $header->from;
                 $head_array['from'] = array();
-                $head_array['from']['name'] = $this->decode_string( trim( $header -> fetchfrom ) );
+                $head_array['from']['name'] = $this->decode_string($from[0]->personal);
                 $head_array['from']['email'] = $this->decode_string($from[0]->mailbox) . "@" . $from[0]->host;
                 if(!$head_array['from']['name'])
@@ -185 +185 @@
         function decode_string($string)
         {       
+                
                 if ((strpos(strtolower($string), '=?iso-8859-1') !== false) || (strpos(strtolower($string), '=?windows-1252') !== false))
                 {
@@ -190 +191 @@
                         foreach ($tmp as $tmp1)
                                 $return .= $this->htmlspecialchars_encode($tmp1->text);
+                                
                         return $return;
                 }
                 else if (strpos(strtolower($string), '=?utf-8') !== false)
                 {
-                        $elements = imap_mime_header_decode($string);
-                        for($i = 0;$i < count($elements);$i++) {
-                                $charset = $elements[$i]->charset;
-                                $text =$elements[$i]->text;
-                                if(!strcasecmp($charset, "utf-8") ||
-                                !strcasecmp($charset, "utf-7")) {
-                                $text = iconv($charset, "ISO-8859-1", $text);
-                        }
-                                $decoded .= $this->htmlspecialchars_encode($text);
-                        }
+                        $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")) {
+                                $decoded .= $this->functions->utf8_to_ncr($text);
+                        }
+                                else
+                                        $decoded .= $this->htmlspecialchars_encode(iconv($charset, "iso-8859-1", $text));
+                        }
                         return $decoded;
                 }
@@ -503 +506 @@
                 $from = $header->from;
                 $return['from'] = array();
-                $tmp = imap_mime_header_decode($from[0]->personal);
-                $return['from']['name'] = $this->decode_string($tmp[0]->text);
+                $return['from']['name'] = $this->decode_string($from[0]->personal);
                 $return['from']['email'] = $this->decode_string($from[0]->mailbox . "@" . $from[0]->host);
                 if ($return['from']['name'])
@@ -518 +520 @@
                 // Sender attribute
                 $sender = $header->sender;
-                $return['sender'] = array();
-                $tmp = imap_mime_header_decode($sender[0]->personal);
-                $return['sender']['name'] = $this->decode_string($tmp[0]->text);
+                $return['sender'] = array();            
+                $return['sender']['name'] = $this->decode_string($sender[0]->personal);
                 $return['sender']['email'] = $this->decode_string($sender[0]->mailbox . "@" . $sender[0]->host);
                 if ($return['sender']['name'])