Changeset 3566 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

12/07/10 09:18:31 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1427 - mantendo o encoding e o content type do e-mail original.

File:

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

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -397 +397 @@
                         $head1 = explode(":",$head);
                         if ( (strtoupper($head1[0]) == "TO") ||
-                                (strtoupper($head1[0]) == "FROM") ||
-                                (strtoupper($head1[0]) == "SUBJECT") ||
-                                (strtoupper($head1[0]) == "DATE") || 
-                                (strtoupper($head1[0]) == "CONTENT-TYPE")) { 
-
-                                        if(strtoupper($head1[0]) == "CONTENT-TYPE"){ 
-                                                $head = str_replace("multipart/mixed","text/html",$head);                        
-                                        } 
-                                        $header .= $head."\n"; 
-                                } 
+                                        (strtoupper($head1[0]) == "FROM") ||
+                                        (strtoupper($head1[0]) == "SUBJECT") ||
+                                        (strtoupper($head1[0]) == "DATE") )
+                                $header .= $head."\r\n";
                 }
 
@@ -414 +408 @@
                                                              para que o método decodeBody do expresso possa trazer tudo certinho*/
 
+                $all_body_type = strtolower($msg->file_type[$params["msg_num"]][0]);
+                $all_body_encoding = $msg->encoding[$params["msg_num"]][0];
+                $all_body_charset = $msg->charset[$params["msg_num"]][0];
+                
+                if($all_body_type=='multipart/alternative') {
+                        if(strtolower($msg->file_type[$params["msg_num"]][2]=='text/html') &&
+                                        $msg->pid[$params["msg_num"]][2] == '1.2') {
+                                $body_part_to_show = '1.2';
+                                $all_body_type = strtolower($msg->file_type[$params["msg_num"]][2]);
+                                $all_body_encoding = $msg->encoding[$params["msg_num"]][2];
+                                $all_body_charset = $msg->charset[$params["msg_num"]][2];
+                        }
+                        else {
+                                $body_part_to_show = '1.1';
+                                $all_body_type = strtolower($msg->file_type[$params["msg_num"]][1]);
+                                $all_body_encoding = $msg->encoding[$params["msg_num"]][1];
+                                $all_body_charset = $msg->charset[$params["msg_num"]][1];
+                        }
+                }
+                else
+                        $body_part_to_show = '1';
+
                 $status = imap_append($this->mbox,
                                 "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],
                                         $header.
+                                        "Content-Type: ".$all_body_type."; charset = \"".$all_body_charset."\"".
+                                        "\r\n".
+                                        "Content-Transfer-Encoding: ".$all_body_encoding.
+                                        "\r\n".
                                         "\r\n".
                                         str_replace("\n","\r\n",$this->decodeBody(
-                                                        imap_fetchbody($this->mbox,imap_msgno($this->mbox, $params["msg_num"]),"1"),
-                                                        $msg->encoding[$params["msg_num"]][0], $msg->charset[$params["msg_num"]][0]
+                                                        imap_fetchbody($this->mbox,imap_msgno($this->mbox, $params["msg_num"]),$body_part_to_show),
+                                                        $all_body_encoding, $all_body_charset
                                                         )
                                         ), "\\Seen"); //Append do novo email, só com header e conteúdo sem anexos.