Changeset 3402

Timestamp:

10/22/10 15:06:23 (14 years ago)

Author:

eduardoalex

Message:

Ticket #1220 - Adicionado controle para uso ou nao da flag importante

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

@@ -3364 +3364 @@
                                 else {
                                         $search_criteria = imap_search($mbox_stream, $filter, SE_UID);
-                                        
-                        if((!strpos($filter,"FLAGGED") === false) || (!strpos($filter,"UNFLAGGED") === false))
+                                        if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag'])
                                         {
-                                $num_msgs = imap_num_msg($mbox_stream);
-                                                $flagged_msgs = array();
-                                                for ($i=$num_msgs; $i>0; $i--)
-                                                {                                                               
-                                                        $iuid = @imap_uid($this->mbox,$i);
-                                                        $header = $this->get_header($iuid);                                                             
-                                                        if(trim($header->Flagged))
+                                if((!strpos($filter,"FLAGGED") === false) || (!strpos($filter,"UNFLAGGED") === false))
+                                                {
+                                        $num_msgs = imap_num_msg($mbox_stream);
+                                                        $flagged_msgs = array();
+                                                        for ($i=$num_msgs; $i>0; $i--)
+                                                        {                                                               
+                                                                $iuid = @imap_uid($this->mbox,$i);
+                                                                $header = $this->get_header($iuid);                                                             
+                                                                if(trim($header->Flagged))
+                                                                {
+                                                                        $flagged_msgs[$i] = $iuid;
+                                                                }
+                                                        }
+                                                        if((count($flagged_msgs) >0) && (strpos($filter,"UNFLAGGED") === false))
                                                         {
-                                                                $flagged_msgs[$i] = $iuid;
+                                                                $arry_diff = array_diff($flagged_msgs,$search_criteria);
+                                                                foreach($arry_diff as $msg)
+                                                                {
+                                                                        $search_criteria[] = $msg;
+                                                                }
+                                                        }
+                                                        else if((count($flagged_msgs) >0) && (is_array($search_criteria)) && (!strpos($filter,"UNFLAGGED") === false))
+                                                        {
+                                                                $search_criteria = array_diff($search_criteria,$flagged_msgs);
                                                         }
                                                 }
-                                                if((count($flagged_msgs) >0) && (strpos($filter,"UNFLAGGED") === false))
-                                                {
-                                                        $arry_diff = array_diff($flagged_msgs,$search_criteria);
-                                                        foreach($arry_diff as $msg)
-                                                        {
-                                                                $search_criteria[] = $msg;
-                                                        }
-                                                }
-                                                else if((count($flagged_msgs) >0) && (is_array($search_criteria)) && (!strpos($filter,"UNFLAGGED") === false))
-                                                {
-                                                        $search_criteria = array_diff($search_criteria,$flagged_msgs);
-                                                }
-                                        }
+                                        }       
                                         if( is_array( $search_criteria) )
                                         {