Changeset 5748

Timestamp:

03/19/12 11:05:19 (11 years ago)

Author:

thiago

Message:

Ticket #2486 - Correção do bug ao abrir os email no anexar mensagem.

File:

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

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

@@ -158 +158 @@
         function get_range_msgs2($params)
         {       
-                include '../prototype/api/controller.php';
+                include_once '../prototype/api/controller.php';
             // Free others requests
             session_write_close();
@@ -195 +195 @@
                                             
                                     $return[$i] = $this->get_info_head_msg( $msg_number , $sample );
+
+                                                                        $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;
+                                                                                $return[$i]['followupflagged'] = $followupflagged[0];
+
+                                                                        }
+
+                                                                        $labeleds = Controller::find(
+                                                                                array('concept' => 'labeled'),
+                                                                                false, 
+                                                                                array('filter' => $filter, 'criteria' => array('deepness' => '2'))
+                                                                        );
                                                                         
-                                                                        
-                                                                $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;
-                                                                        $return[$i]['followupflagged'] = $followupflagged[0];
-
-                                                                }
-
-                                                                $labeleds = Controller::find(
-                                                                        array('concept' => 'labeled'),
-                                                                        false, 
-                                                                        array('filter' => $filter, 'criteria' => array('deepness' => '2'))
-                                                                );
-
-                                                                
-                                                                if(isset($labeleds) && count($labeleds) > 0 && $labeleds){
-                                                                        $return[$i]['labels'] = array();
-
-                                                                        foreach ($labeleds as $e){
-                                                                        
-                                                                                $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $e['labelId']));     
-                                                                                $return[$i]['labels'][] = $labels;
-                                                                        }       
-                                                                }
-                              $i++;
+                                                                        if(isset($labeleds) && count($labeleds) > 0 && $labeleds){
+                                                                                $return[$i]['labels'] = array();
+
+                                                                                foreach ($labeleds as $e){
+                                                                                
+                                                                                        $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $e['labelId']));     
+                                                                                        $return[$i]['labels'][] = $labels;
+                                                                                }       
+                                                                        }
+                                    $i++;
                             }
                     }