Changeset 2905

Timestamp:

06/08/10 15:48:01 (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) (1 diff)

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

@@ -373 +373 @@
                 $header = "";
 
-                $headertemp = explode("\n",imap_fetchheader($this->mbox, imap_msgno($this->mbox, $params["msg_num"])));
-                foreach($headertemp as $head) {//Se eu colocar todo o header do email dá pau no append, então procuro apenas o que interessa.
-                $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";
-                        }
-                }
+                $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.
-                                                             Então uso essa classe para verificar a codificação e o charset,
-                                                             para que o método decodeBody do expresso possa trazer tudo certinho*/
+                        Então uso essa classe para verificar a codificação e o charset,
+                        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]
-                                                        )
-                                        ), "\\Seen"); //Append do novo email, só com header e conteúdo sem anexos.
+                        "{".$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.
 
                 if(!$status)
                 {
                         $return["status"] = false;
-                        $return["msg"] = lang("error appending mail on delete attachments");
+                        $return["msg"] = "error appending mail on delete attachments";
                 }
                 else