Changeset 1319 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

08/13/09 11:34:34 (15 years ago)

Author:

amuller

Message:

Ticket #621 - Melhoria no desanexar marcando como lida/

File:

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

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

@@ -315 +315 @@
                         $this->mbox = $this->open_mbox($params["folder"]);
                 $return["status"] = true;
-                $return["msg_num"] = $params["msg_num"];
                 $header = "";
                 
@@ -321 +320 @@
                 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]) == strtoupper("to")) || 
-                                        (strtoupper($head1[0]) == strtoupper("from")) || 
-                                        (strtoupper($head1[0]) == strtoupper("subject")) ||
-                                        (strtoupper($head1[0]) == strtoupper("date")) )
+                        if ( (strtoupper($head1[0]) == "TO") || 
+                                        (strtoupper($head1[0]) == "FROM") || 
+                                        (strtoupper($head1[0]) == "SUBJECT") ||
+                                        (strtoupper($head1[0]) == "DATE") )
                                 $header .= $head."\r\n";
                 }
@@ -333 +332 @@
                                                              para que o método decodeBody do expresso possa trazer tudo certinho*/
                 
-                $status = @imap_append($this->mbox,
+                $status = imap_append($this->mbox,
                                 "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],
                                         $header.
@@ -341 +340 @@
                                                         $msg->encoding[$params["msg_num"]][0], $msg->charset[$params["msg_num"]][0]
                                                         )                                       
-                                        )); //Append do novo email, só com header e conteúdo sem anexos.
-                
-                if(!$status) {
+                                        ), "\\Seen"); //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");
                 }
-        
-                @imap_delete($this->mbox, imap_msgno($this->mbox, $params["msg_num"])); //Insere o novo e-mail sem anexos.
-                @imap_expunge($this->mbox); //Deleta o e-mail com anexos
+                else
+                {
+                        $status = imap_status($this->mbox, "{".$this->imap_server.":".$this->imap_port."}".$params['folder'], SA_UIDNEXT);
+                        $return['msg_no'] = $status->uidnext - 1; 
+                        imap_delete($this->mbox, imap_msgno($this->mbox, $params["msg_num"]));
+                        imap_expunge($this->mbox);
+                }
                 
                 return $return;