Changeset 8098

Timestamp:

04/22/13 11:22:59 (10 years ago)

Author:

marcieli

Message:

Ticket #3429 - Corrigida inconsistencia na exibicao da flag importante nas msgs retornadas da busca avancada.

File:

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

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

@@ -458 +458 @@
             $return['attachment'] = ( preg_match('/((Content-Disposition:(.)*([\r\n\s]*filename))|(Content-Type:(.)*([\r\n\s]*name)))/i', $mimeBody) ) ? '1' : '0'; //Verifica se a anexos na mensagem
             $return['reply_toaddress'] = isset($header->reply_toaddress) ? self::decodeMimeString($header->reply_toaddress) : '';
-            $return['flag'] = $header->Unseen.$header->Recent.$header->Flagged.$header->Draft.$header->Answered.$header->Deleted.( $return['attachment'] === '1' ? 'T': '' );
-                        
-                        if (!empty($header->to)){
+            $return['flag'] = $header->Unseen.
+                $header->Recent.
+                ($header->Flagged == 'F' || !( preg_match('/importance *: *(.*)\r/i', $mimeHeader , $importance) === 0 )? 'F' : '').
+                $header->Draft.
+                $header->Answered.
+                $header->Deleted.
+                ( $return['attachment'] === '1' ? 'T': '' );
+
+        if (!empty($header->to)){
                                 foreach ($header->to as $i => $v){
                                         $return['to'][$i] = self::formatMailObject( $v );
@@ -3711 +3717 @@
         }
         
-        function set_messages_flag_from_search($params){                
+        function set_messages_flag_from_search($params){
                 $error = False;
                 $fileNames = "";
@@ -4463 +4469 @@
                                                                                                 $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $e['labelId']));     
                                                                                                 $elem['labels'][$e['labelId']] = $labels;
-}                                                                                       
+                                            }
                                             $retorno[] = $elem;
                                         }
@@ -4495 +4501 @@
             $arrayRetorno['data']               =  $pageret;
             $arrayRetorno['currentTab'] =  $params['current_tab'];
-            return ($pageret) ? $arrayRetorno : 'none';
+        return ($pageret) ? $arrayRetorno : 'none';
         }
 
@@ -5134 +5140 @@
                                 $return['msgs'][$i]['flag'] = ' ';
                                 $return['msgs'][$i]['flag'] .= $msg->Unseen ? $msg->Unseen : '';
-                                $return['msgs'][$i]['flag'] .= $msg->Recent ? $msg->Recent : '';        
+                                $return['msgs'][$i]['flag'] .= $msg->Recent ? $msg->Recent : '';
                                 $return['msgs'][$i]['flag'] .= $msg->Draft ? $msg->Draft : '';  
                                 $return['msgs'][$i]['flag'] .= $msg->Answered ? $msg->Answered : '';    
@@ -5195 +5201 @@
                         $nMsgs[] = $v;
                 }
-                $return['msgs'] = $nMsgs;       
-                
-                $return = json_encode($return);         
+                $return['msgs'] = $nMsgs;
+
+                $return = json_encode($return);
                 $return = base64_encode($return);
-        
+        
                 return $return;
         }