Changeset 5766

Timestamp:

03/20/12 18:11:18 (12 years ago)

Author:

angelo

Message:

Ticket #1985 - Falha na ordenacao das mensagens pela coluna Quem

File:

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

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

@@ -3178 +3178 @@
         }
 
-        function messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd)
+        function messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder)
         {
                 if ($sort_box_type != "SORTFROM" && $search_box_type!= "FLAGGED"){
@@ -3197 +3197 @@
                         if ($offsetEnd >  $num_msgs) {$offsetEnd = $num_msgs;}
                         $slice_array = true;
-                 
+            $from_to_sent = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'];     
                         for ($i=$num_msgs; $i>0; $i--)
                         {
@@ -3221 +3221 @@
                                 }
 
-                                if($sort_box_type=='SORTFROM') {
-                                        if (($header->from[0]->mailbox . "@" . $header->from[0]->host) == $_SESSION['phpgw_info']['expressomail']['user']['email'])
-                                                $from = $header->to;
+                                if($sort_box_type=='SORTFROM') {                                                                                
+                                        if (strrpos($folder,'Sent') && $from_to_sent)
+                                                $tmp = self::formatMailObject($header->to[0]);
                                         else
-                                                $from = $header->from;
-                                        if(isset($from[0]->personal))
-                                        $tmp = imap_mime_header_decode($from[0]->personal);
-                                        else
-                                                $tmp = null;
-                                        if (isset($tmp[0]->text))
-                                                $sort[$iuid] = $tmp[0]->text;
-                                        else
-                                                $sort[$iuid] = $from[0]->mailbox . "@" . $from[0]->host;
+                                                $tmp = self::formatMailObject($header->from[0]);
+                                        $sort[$iuid] = ($tmp['name']) ? $tmp['name'] : $tmp['email'];   
                                 }
                                 else if($sort_box_type=='SORTSUBJECT') {
@@ -3719 +3712 @@
                         $this->mbox = $this->open_mbox($folder);
 
-                return $this->messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd);
+                return $this->messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder);
         }