Changeset 6427 for sandbox/2.4.1-1

Timestamp:

06/05/12 18:11:11 (12 years ago)

Author:

marcieli

Message:

Ticket #2764 - Corrigido bug ao remover flag ao excluir/mover msgs.

Location:

sandbox/2.4.1-1/expressoMail1_2

Files:

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

sandbox/2.4.1-1/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -5349 +5349 @@
                                 $message_number = explode(',', $message_number);
                                 $this->mbox = $this->open_mbox($folder);
-                                foreach ($message_number as $k => $m) {                                         
+                                foreach ($message_number as $k => $m) {
+ob_start();
+print_r("folder \n");
+print_r($folder);
+print_r("message number \n");
+print_r($m);
+
+$output = ob_get_clean();
+file_put_contents( "/tmp/marci.log", $output , FILE_APPEND);                            
                                                 imap_clearflag_full($this->mbox, $m, '$FilteredMessage', ST_UID);
                                         }
@@ -5369 +5377 @@
                         }
                 }
+                
+                return array('status' => "success"); 
         }
 

sandbox/2.4.1-1/expressoMail1_2/js/main.js

@@ -1092 +1092 @@
                         Element('tot_m').innerHTML = n_total_msg;
                 }
-                // remove a flag $FilteredMessage da mensagem ao ser movida
-                $.each(fromRules, function(index, value) {
-                        if(value == folder){
-                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+new_folder+"&msg_number="+msgs_number, function(){}); 
-                                return false;
-                        }
-                });
                 refresh();
         }
@@ -1133 +1126 @@
         refresh();
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
-                if(!not_opem_previus){
-                        cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message, handler_move_msgs);
-                }else{
-                        cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+false, handler_move_msgs);
-        }
+                        // remove a flag $FilteredMessage da mensagem ao ser movida
+                var handler_removeFlag = function(data){
+                        if(!not_opem_previus){
+                                cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message, handler_move_msgs);
+                        }else{
+                                cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+false, handler_move_msgs);
+                        }
+                }
+                $.each(fromRules, function(index, value) {
+                        if(value == folder){
+                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&msg_number="+msgs_number, handler_removeFlag); 
+                                return false;
+                        }
+                });
+                
+                
         }else
                 write_msg(get_lang('No selected message.'));

sandbox/2.4.1-1/expressoMail1_2/js/messages_controller.js

@@ -47 +47 @@
                 if (msgs_number == 'selected')
                         msgs_number = get_selected_messages();
-                
-                // remove a flag $FilteredMessage da mensagem ao excluí-la
-                $.each(fromRules, function(index, value) {
-                        if(value == folder){
-                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&msg_number="+msgs_number, function(){});     
-                                return false;
-                        }
-                });
                 
                 if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){