Changeset 3955

Timestamp:

04/04/11 16:54:18 (13 years ago)

Author:

thiagoaos

Message:

Ticket #1704 - Corrigido a atualizacao e ordenacao quando um rascunho eh salvo.

Location:

branches/2.2/expressoMail1_2

Files:

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

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

@@ -1633 +1633 @@
                         * não preciso reimplementar o método utilizando o fetchheader.
                         */
-                    
-                        $tempHeader = @imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
+    
+                        $tempHeader = @imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
                         $flag = preg_match('/importance *: *(.*)\r/i', $tempHeader, $importance);
                         $return[$i]['Importance'] = $flag==0?"Normal":$importance[1];
@@ -1646 +1646 @@
 
                         $return[$i]['msg_number']       = $msg_number;
+                        
+                        //get the next msg number to append this msg in the view in a correct place
+                        $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]['next_msg_number'] = $msgs_in_the_server[$msg_key_position + 1];
 
                         $return[$i]['msg_folder']       = $folder;
-                        // Atribui o tipo (normal, signature ou cipher) ao campo Content-Type
+                        // Atribui o tipo (normal, signature ou cipher) ao campo Content-Type
                         $return[$i]['ContentType']  = $this->getMessageType($msg_number, $tempHeader);
                         $return[$i]['Recent']           = $header->Recent;

branches/2.2/expressoMail1_2/js/main.js

@@ -392 +392 @@
                 if(!verify_session(data))
                         return;
+                        
                 var box = Element("tbody_box");
                 if (box.childNodes.length == 0)
@@ -440 +441 @@
                                         var new_msg = this.make_tr_message(data[i], current_folder, data.offsetToGMT);
                                         _dragArea.makeDragged(new_msg, data[i].msg_number, data[i].subject, true);
-                                        if (data[i].Recent == 'N')
+                                        
+                                        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 
@@ -1882 +1886 @@
                                 change_tr_properties(tr_msg, data.msg_no, data.subject);
                         }
-
-                }
+                } else {
+                        refresh();
+                }
+
                 var save_link = Element("save_message_options_"+border_id);
                 save_link.onclick = '';