Changeset 7331 for sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

10/01/12 16:17:43 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Adicionado funcionalidades de manipulação de flags de mensagens locais

File:

• sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -4643 +4643 @@
                         
         $return['msg_no'] = $status->uidnext - 1;
-        $return['error'] = imap_last_error();
-        if(!$return['error'] && $flags != '' ){
-
-                  $flags_array=explode(':',$flags);
-                  //"Answered","Draft","Flagged","Unseen"
-                  $flags_fixed = "";
-                  if($flags_array[0] == 'A')
-                        $flags_fixed.="\\Answered ";
-                  if($flags_array[1] == 'X')
-                        $flags_fixed.="\\Draft ";
-                  if($flags_array[2] == 'F')
-                        $flags_fixed.="\\Flagged ";
-                  if($flags_array[3] != 'U')
-                        $flags_fixed.="\\Seen ";
-                  if($flags_array[4] == 'F')
-                        $flags_fixed.="\\Answered \\Draft ";
-                  imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
-                }
+                
+                //Marcosw inicio - inserida validação para inserir flags
+        $return['error'] = '';
+                if(imap_last_error() && imap_last_error() != "SECURITY PROBLEM: insecure server advertised AUTH=PLAIN")
+            $return['error'] = imap_last_error();
+        //Marcosw fim
+
+                if(!$return['error'] && $flags != '' ){
+                        $flags_array=explode(':',$flags);
+                        //"Answered","Draft","Flagged","Unseen"
+                        $flags_fixed = "";
+                        if($flags_array[0] == 'A')
+                            $flags_fixed.="\\Answered ";
+                        if($flags_array[1] == 'X')
+                            $flags_fixed.="\\Draft ";
+                        if($flags_array[2] == 'F')
+                            $flags_fixed.="\\Flagged ";
+                        if($flags_array[3] != 'U')
+                            $flags_fixed.="\\Seen ";
+                        if($flags_array[4] == 'F')
+                            $flags_fixed.="\\Answered \\Draft ";
+                        imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
+        }
         
         //Ignorando erro de AUTH=Plain
@@ -5498 +5503 @@
 
     //MailArchiver -> get message flags only, invoked at archive operation
-    //Marcosw início - modificação da estrutura da função, removendo estr. de repetição desnecessária
-    function get_msg_flags($args){       
-                $msg_folder = $args['folder'];
+    //Marcosw início - Inserido código novo MailArchiver
+    function get_msg_flags($args){  
+        $msg_folder = $args['folder'];
         $msg_n = $args['msg_number'];
+        $arr_msg = explode(",", $msg_n);
+       
+        for($i=0; $i<count($arr_msg); $i++){
+                        
+            if(!$this->mbox || !is_resource($this->mbox))
+                $this->mbox = $this->open_mbox($msg_folder);
         
-        if(!$this->mbox || !is_resource($this->mbox))
-            $this->mbox = $this->open_mbox($msg_folder);
-    
-        if(!is_resource($this->mbox))
-            return(false);
-          
-        $msgno_imap = imap_msgno($this->mbox, $msg_n);          
-        $header = @imap_headerinfo($this->mbox, $msgno_imap, 80, 255);
-                
-        if (!is_object($header))
-            return false;
-
-        $taglist["msgid"] = $msg_n;
-        $taglist["unseen"] = $header->Unseen;
-        $taglist["recent"] = $header->Recent;
-        $taglist["flagged"] = $header->Flagged;
-        $taglist["draft"] = $header->Draft;
-        $taglist["answered"] = $header->Answered;
-        $taglist["deleted"] = $header->Deleted;
-    
-        if($header->Answered =='A' && $header->Draft == 'X')
-            $taglist['forwarded'] = 'F';
-        else
-            $taglist['forwarded'] = ' ';
-    
-        if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']) {
-            $flag = preg_match('/importance *: *(.*)\r/i',imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_n)),$importance);
-            $taglist["importance"] = $flag==0?"Normal":$importance[1];
+            if(!is_resource($this->mbox))
+                return(false);
+                       
+            $msgno_imap = imap_msgno($this->mbox, $msg_n);          
+                $header = @imap_headerinfo($this->mbox, $msgno_imap, 80, 255);
+                
+            if (!is_object($header))
+                return false;
+
+            $taglist[$i]["msgid"] = $msg_n;
+            $taglist[$i]["unseen"] = $header->Unseen;
+            $taglist[$i]["recent"] = $header->Recent;
+            $taglist[$i]["flagged"] = $header->Flagged;
+            $taglist[$i]["draft"] = $header->Draft;
+            $taglist[$i]["answered"] = $header->Answered;
+            $taglist[$i]["deleted"] = $header->Deleted;
+        
+            if($header->Answered =='A' && $header->Draft == 'X')
+                $taglist[$i]['forwarded'] = 'F';
+            else
+                $taglist[$i]['forwarded'] = ' ';
         }
 
@@ -5539 +5543 @@
          * Fim dos métodos 
          */
-        
 }
 ?>