Changeset 2906 for trunk

Timestamp:

06/08/10 16:49:25 (14 years ago)

Author:

amuller

Message:

Ticket #737 - Arrumando flags de desanexar e outros campos do header

File:

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

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

@@ -374 +374 @@
 
                 $headertemp = imap_headerinfo($this->mbox, imap_msgno($this->mbox, $params["msg_num"]));
-                $header = "Date: ".$headertemp->date . "\r\n";
-                $header .= "To: ".$headertemp->toaddress . "\r\n";
-                $header .= "From: ".$headertemp->fromaddress . "\r\n";
-                $header .= "X-Expresso-Modified: ".date("F j, Y, g:i a"). "\r\n";
-                $header .= "Cc: ".$headertemp->ccaddress."\r\n";
-                $header .= "Bcc: ".$headertemp->bccaddress. "\r\n";
-                $header .= "Sender: ".$headertemp->senderaddress. "\r\n";
-                $header .= "Reply-to: ".$headertemp->reply_toaddress . "\r\n";
-                $header .= "Subject: ".$headertemp->subject . "\r\n";
-                $header .= "Content-Type: text/html". "\r\n";
-
                 $msg = &new message_components($this->mbox);
                 $msg->fetch_structure($params["msg_num"]);/* O fetchbody tava trazendo o email com problemas na acentuação.
@@ -390 +379 @@
                         para que o método decodeBody do expresso possa trazer tudo certinho*/
 
-
                 $flags = $headertemp->Unseen == 'U' ? '' : '\Seen';
                 $flags .= $headertemp->Flagged == 'F' ? ' \Flagged' : '';
                 $flags .= $headertemp->Answered == 'A' ? ' \Answered' : '';
                 $flags .= $headertemp->Draft == 'D' ? ' \ Draft' : '';
-
-                $status = imap_append($this->mbox,
-                        "{".$this->email_server['imapServer'].":".$this->email_server['imapPort'].$this->imap_options."}".$params["folder"],
-                        $header.
-                        "\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]
-                        )
-                ), $flags); //Append do novo email, só com header e conteúdo sem anexos.
+                $internal_date = $headertemp->date;
+
+                $headertemp = explode("\n",imap_fetchheader($this->mbox, imap_msgno($this->mbox, $params["msg_num"])));
+                foreach($headertemp as $head) { 
+                        $head1 = explode(":",$head);
+                        if(strtoupper($head1[0]) == "CONTENT-TYPE"){ 
+                                $head = str_replace("multipart/mixed","text/html",$head);
+                                $head = str_replace("multipart/related","text/html",$head);
+                                $header .= $head."\n"; 
+                                break;
+                        }
+                        else
+                                $header .= $head."\n"; 
+                }
+
+                if (strnatcmp(phpversion(),'5.3.2') >= 0)
+                        $status = imap_append($this->mbox,
+                                "{".$this->email_server['imapServer'].":".$this->email_server['imapPort'].$this->imap_options."}".$params["folder"],
+                                $header.
+                                "\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]
+                                )
+                        ), $flags, $internal_date );
+                else
+                        $status = imap_append($this->mbox,
+                                "{".$this->email_server['imapServer'].":".$this->email_server['imapPort'].$this->imap_options."}".$params["folder"],
+                                $header.
+                                "\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]
+                                )
+                        ), $flags );
+
 
                 if(!$status)