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

Timestamp:

09/09/10 15:34:47 (14 years ago)

Author:

amuller

Message:

Ticket #428 - Implementação da paginação da busca

File:

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

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

@@ -727 +727 @@
 
                 $return = ""; 
-                if( (!isset($this->preferences['preview_msg_subject']) || ($this->preferences['preview_msg_subject'] != "1")) &&  
-                        (!isset($this->preferences['preview_msg_tip']    ) || ($this->preferences['preview_msg_tip']     != "1")) ) 
+                if( (!isset($this->prefs['preview_msg_subject']) || ($this->prefs['preview_msg_subject'] != "1")) &&  
+                        (!isset($this->prefs['preview_msg_tip']    ) || ($this->prefs['preview_msg_tip']     != "1")) ) 
                 { 
                         $return['body'] = ""; 
@@ -3237 +3237 @@
         function search_msg($params = ''){
             $mbox_stream = "";
-            if(strpos($params['condition'],"#")===false) { //local messages
+            if(strpos($params['condition'],"#")===false) { //local messages? It shouldn't be necessary, should it? FIXME
                     $search=false;
             }
             else {
                     $search = explode(",",$params['condition']);
-            }
+            }
+            $params['page'] = $params['page']*1;
 
             if(is_array($search)){
@@ -3311 +3312 @@
                             $search_criteria = imap_search($mbox_stream, $_filter, SE_UID);
 
-                            if(is_array($search_criteria)) //&& count($search_criteria) < 50)
+                            if(is_array($search_criteria))
                             {
                                 foreach($search_criteria as $new_search)
@@ -3319 +3320 @@
                                     $elem['uid'] = $new_search; 
                                     $retorno[] = $elem; 
-
-                                    /* NOTE: This code was lost on 2.2 merge 
-                                    if ($search_result_number != '65536' && $sum == $search_result_number)
-                                    {
-                                        return $retorno ? $sum . "=sumResults=" . $retorno : "none";
-                                    }
-
-                                    $m_token = trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--".$new_search."##"."\n");
-                                    if(!@strstr($retorno,$m_token))
-                                    {
-                                        $retorno .= $m_token;
-                                        $sum ++;
-                                    }
-                                     */
-                                }
-                            }
+                                }
+                            }
                         }
                     }
@@ -3346 +3333 @@
                                     $elem['boxname'] = mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ); 
                                     $elem['uid'] = $new_search; 
-                                    $retorno[] = $elem; 
-                                //  NOTE: This code was lost on 2.2 merge 
-                                /*if ($search_result_number != '65536' && $sum == $search_result_number)
-                                {
-                                    return $retorno ? $sum . "=sumResults=" . $retorno : "none";
-                                }
-                                $retorno .= trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--" . $new_search."##"."\n");
-                                $sum++;*/
+                                    $retorno[] = $elem;
                             }
                         }
-                    }
+                    }
                 }
             }
@@ -3362 +3342 @@
             {
                 imap_close($mbox_stream);
-            }
-
-            if ($retorno)
+            }
+            $num_msgs = count($retorno);
+
+            /* Comparison functions, descendent is ascendent with parms inverted */
+            function SORTDATE($a, $b) { return ($a['udate'] < $b['udate']); }
+            function SORTDATE_REVERSE($b, $a) { return SORTDATE($a,$b); }
+
+            function SORTWHO($a, $b) { return (strtoupper($a['from']) > strtoupper($b['from'])); }
+            function SORTWHO_REVERSE($b, $a) { return SORTWHO($a,$b); }
+
+            function SORTSUBJECT($a, $b) { return (strtoupper($a['subject']) > strtoupper($b['subject'])); }
+            function SORTSUBJECT_REVERSE($b, $a) { return SORTSUBJECT($a,$b); }
+
+            function SORTBOX($a, $b) { return ($a['boxname'] > $b['boxname']); }
+            function SORTBOX_REVERSE($b, $a) { return SORTBOX($a,$b); }
+
+            function SORTSIZE($a, $b) { return ($a['size'] > $b['size']); }
+            function SORTSIZE_REVERSE($b, $a) { return SORTSIZE($a,$b); }
+
+            usort($retorno, $params['sort_type']);
+            $pageret = array_slice($retorno, $params['page'] * $this->prefs['max_email_per_page'], $this->prefs['max_email_per_page']);
+            $arrayRetorno['num_msgs'] =  $num_msgs;
+            $arrayRetorno['data'] =  $pageret;
+
+            if ($pageret)
             {
-                return $retorno;
+                return $arrayRetorno;
             }
             else