Changeset 4626

Timestamp:

06/20/11 10:29:52 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #2028 - Erro ao desanexar mensagem com encoding base64

File:

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

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

@@ -456 +456 @@
                         $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"]),$body_part_to_show),
-                                                        $all_body_encoding, $all_body_charset
-                                                        )
-                                        ), "\\Seen"); //Append do novo email, só com header e conteúdo sem anexos.
+                if (($all_body_charset == "utf-8") && ($all_body_encoding == "base64")){
+                        $status = imap_append($this->mbox,
+                                        "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],
+                                                $header.
+                                                "Content-Type: ".$all_body_type."; charset = \"iso-8859-1\"".
+                                                "\r\n".
+                                                "Content-Transfer-Encoding: quoted-printable".
+                                                "\r\n".
+                                                "\r\n".
+                                                str_replace("\n","\r\n",$this->decodeBody(
+                                                                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.                       
+                }else{  
+                        $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"]),$body_part_to_show),
+                                                                $all_body_encoding, $all_body_charset
+                                                                )
+                                                )
+                                                , "\\Seen"); //Append do novo email, só com header e conteúdo sem anexos.
+                }
 
                 if(!$status)