Changeset 5900

Timestamp:

04/09/12 17:21:34 (12 years ago)

Author:

gustavo

Message:

Ticket #2601 - Ordenação errada de mensagens

File:

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

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

@@ -3197 +3197 @@
         function messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder)
         {
+                $sort = array();
                 if ($sort_box_type != "SORTFROM" && $search_box_type!= "FLAGGED"){
                         $imapsort = imap_sort($this->mbox,constant($sort_box_type),$sort_box_reverse,SE_UID,$search_box_type);
-                        foreach($imapsort as $iuid)
-                                $sort[$iuid] = "";
-                        
+                        foreach($imapsort as $iuid){
+                                $sort[$iuid] = $iuid;
+                        }
                         if ($offsetBegin == -1 && $offsetEnd ==-1 )
                                 $slice_array = false;
@@ -3209 +3210 @@
                 else
                 {
-                        $sort = array();
                         if ($offsetBegin > $offsetEnd) {$temp=$offsetEnd; $offsetEnd=$offsetBegin; $offsetBegin=$temp;}
                         $num_msgs = imap_num_msg($this->mbox);
                         if ($offsetEnd >  $num_msgs) {$offsetEnd = $num_msgs;}
                         $slice_array = true;
-            $from_to_sent = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'];     
+            $from_to_sent = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'];  
+                        $dates = array();
                         for ($i=$num_msgs; $i>0; $i--)
                         {
@@ -3221 +3222 @@
                                 $iuid = @imap_uid($this->mbox,$i);
                                 $header = $this->get_header($iuid);
+                                
                                 // List UNSEEN messages.
                                 if($search_box_type == "UNSEEN" &&  (!trim($header->Recent) && !trim($header->Unseen))){
@@ -3254 +3256 @@
                                         $sort[$iuid] = $header->udate;
                                 }
-
-                        }
-                        natcasesort($sort);
-
+                                $dates[$iuid] = $header->udate;
+                        }
+                        $keys = array_keys($sort);
+                        array_multisort($sort, SORT_ASC, $keys, SORT_DESC, $dates, SORT_DESC);
+                        $sort = array_combine($keys, $sort);
                         if ($sort_box_reverse)
                                 $sort = array_reverse($sort,true);
@@ -3264 +3267 @@
                         $sort = array();
                 }
-                
-                        
-
-
                 if ($slice_array)
                         $sort = array_slice($sort,$offsetBegin-1,$offsetEnd-($offsetBegin-1),true);
-
-
                 return $sort;