Changeset 3573 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

12/10/10 11:09:39 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1406 - primeira versão da implementação da busca

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3246 +3246 @@
                 $criterias = array ("TO","SUBJECT","FROM","CC");
                 $return = array();
-                $folders = $this->get_folders_list();
+                $folder_params = array("noSharedFolders"=>1);
+                if(isset($params['folderType']))
+                        $folder_params['folderType'] = $params['folderType'];
+                $folders = $this->get_folders_list($folder_params);
+
                 $num_msgs = 0;
-                                          
+                $max_msgs = $params['max_msgs'];
+                $return["total_msgs"] = 0;
                 foreach($folders as $id =>$folder)
                 {
@@ -3255 +3260 @@
                     {
                         $_filter = $criteria_fixed . ' "'.$params['filter'].'"';
-                                        $mbox_stream = $this->open_mbox($folder['folder_name']);
+                                        $mbox_stream = $this->open_mbox($folder['folder_id']);
         
                                         $messages = imap_search($mbox_stream, $_filter, SE_UID);
@@ -3266 +3271 @@
                                                                         
                                         foreach($messages as $msg_number)
-                                        {                                       
+                                        {       
+                                                if($num_msgs>=$max_msgs)
+                                                        break;                          
                                                 $temp = $this->get_info_head_msg($msg_number);
                                                 if(!$temp)
                                                         return false;
-                
+                                                $temp['msg_folder'] = $folder['folder_id'];
                                                 $return[$num_msgs] = $temp;
                                                 $num_msgs++;
+                                                
                                         }
                                         $return['num_msgs'] = $num_msgs;
-                                        
+                                        $return["total_msgs"]+=count($messages);
                                         if($mbox_stream)
                                                 imap_close($mbox_stream);
-                                }
-                        }
-                                
+                                        if($num_msgs>=$max_msgs)
+                                                        continue;
+                                }
+                        }                       
                 }
                 return $return;