Changeset 4764

Timestamp:

07/15/11 14:15:53 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Ordenação incorreta de mensagens. r4611

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/main.js (modified) (1 diff)

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

@@ -1762 +1762 @@
                 foreach($msg_to_insert as $msg_number)
                         $msgs_to_exec[] = $msg_number;
-                sort($msgs_to_exec);
+                //sort($msgs_to_exec);
 
                 $return = array();
@@ -1793 +1793 @@
                         $msg_key_position = array_search($msg_number, $msgs_in_the_server);
                         
-                        if($msg_key_position !== false && array_key_exists($msg_key_position + 1) !== false)
+                        $return[$i]['msg_key_position'] = $msg_key_position;
+                        if($msg_key_position !== false && array_key_exists($msg_key_position + 1,$msgs_in_the_server) !== false)
                                 $return[$i]['next_msg_number'] = $msgs_in_the_server[$msg_key_position + 1];
+                        else
+                                $return[$i]['next_msg_number'] = $msgs_in_the_server[$msg_key_position];
 
                         $return[$i]['msg_folder']       = $folder;

trunk/expressoMail1_2/js/main.js

@@ -435 +435 @@
                                         _dragArea.makeDragged(new_msg, data[i].msg_number, data[i].subject, true);
                                         
-                                        if( data[i].next_msg_number != undefined && data[i].next_msg_number != null )
-                                                box.insertBefore(new_msg, Element(data[i].next_msg_number));
-                                        else if (data[i].Recent == 'N')
+                                        if( data[i].next_msg_number != undefined && data[i].next_msg_number != null ){
+
+                                        box.insertBefore(new_msg, box.childNodes[data[i].msg_key_position]);
+                                        }
+                                        else if (data[i].Recent == 'N'){
                                                 box.insertBefore(new_msg,box.firstChild);
-                                        else 
+                                        }
+                                        else {
                                                 box.appendChild(new_msg);
+                                        }
+//                                      if( data[i].next_msg_number != undefined && data[i].next_msg_number != null )
+//                                              box.insertBefore(new_msg, Element(data[i].next_msg_number));
+//                                      else if (data[i].Recent == 'N')
+//                                              box.insertBefore(new_msg,box.firstChild);
+//                                      else
+//                                              box.appendChild(new_msg);
 
                                         total_messages_element.innerHTML = parseInt( total_messages_element.innerHTML ) + 1;