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

Timestamp:

03/26/12 14:41:00 (12 years ago)

Author:

thiago

Message:

Ticket #2486 - Implementação da recuperação das flags e labels pelo imap_fun.

File:

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

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

@@ -198 +198 @@
                             } 
                                                         
-                                                        foreach($return as $msg_number => $message_content){
-                                                                if(!isset($message_content['msg_number']))
+                                                        $filter = array('AND', array('=', 'folderName', $folder), array('IN','messageNumber', $sort_array_msg[0]));
+                                                        $followupflagged = Controller::find(
+                                                                array('concept' => 'followupflagged'),
+                                                                false, 
+                                                                array('filter' => $filter, 'criteria' => array('deepness' => '2'))
+                                                        );
+                                                        $labeleds = Controller::find(
+                                                                array('concept' => 'labeled'),
+                                                                false, 
+                                                                array('filter' => $filter, 'criteria' => array('deepness' => '2'))
+                                                        );
+                                                        for($i=0; $i<count($sort_array_msg); $i++){
+                                                                if(!isset($return[$i]['msg_number']))
                                                                         continue;
-                                                                        
-                                                                        $filter = array('AND', array('=', 'folderName', $folder), array('=','messageNumber', $msg_number));
-                                                                        $followupflagged = Controller::find(
-                                                                                array('concept' => 'followupflagged'),
-                                                                                false, 
-                                                                                array('filter' => $filter, 'criteria' => array('deepness' => '2'))
-                                                                        );
-
-                                                                        if(isset($followupflagged[0]['followupflagId']))
-                                                                        {
-                                                                                $followupflag = Controller::read( array( 'concept' => 'followupflag', 'id' => $followupflagged[0]['followupflagId'] ));     
-                                                                                $followupflagged[0]['followupflag'] = $followupflag;
-                                                                                $message_content['followupflagged'] = $followupflagged[0];
-
+                                                                for($ii=0; $ii<count($followupflagged); $ii++){
+                                                                        if($return[$i]['msg_number'] == $followupflagged[$ii]['messageNumber']){
+                                                                                $followupflag = Controller::read( array( 'concept' => 'followupflag', 'id' => $followupflagged[$ii]['followupflagId'] ));
+                                                                                $return[$i]['followupflagged'] = $followupflagged[$ii];
+                                                                                $return[$i]['followupflagged']['followupflag'] = $followupflag;
+                                                                                break;
                                                                         }
-
-                                                                        $labeleds = Controller::find(
-                                                                                array('concept' => 'labeled'),
-                                                                                false, 
-                                                                                array('filter' => $filter, 'criteria' => array('deepness' => '2'))
-                                                                        );
-                                                                        
-                                                                        if(isset($labeleds) && count($labeleds) > 0 && $labeleds){
-                                                                                $message_content['labels'] = array();
-                                                                                foreach ($labeleds as $e){      
-                                                                                        $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $e['labelId']));     
-                                                                                        $message_content['labels'][] = $labels;
-                                                                                }       
+                                                                }
+                                                                for($ii=0; $ii<count($labeleds); $ii++){
+                                                                        if($return[$i]['msg_number'] == $labeleds[$ii]['messageNumber']){
+                                                                                $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $labeleds[$ii]['labelId'])); 
+                                                                                $return[$i]['labels'][$labeleds[$ii]['labelId']] = $labels;
                                                                         }
+                                                                }
                                                         }
-
                     }
                     $return['num_msgs'] =  $num_msgs;                           
@@ -1804 +1799 @@
                 */
                 // $tag_list = Array(true, "b", "a", "i", "img", "strong", "em", "p");
+
+
                 $rm_tags_with_content = Array(
                                 'script',