Changeset 3693

Timestamp:

01/18/11 10:42:37 (13 years ago)

Author:

wmerlotto

Message:

Ticket #1501 - Correcao da funcionalidade de marcar uma msg, aberta, como spam/nao-spam.

Location:

branches/2.2/expressoMail1_2

Files:

• js/main.js (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (1 prop)

branches/2.2/expressoMail1_2/js/main.js

@@ -2358 +2358 @@
                         proxy_mensagens.proxy_set_message_flag(msgs_number, "unseen");
                 proxy_mensagens.proxy_move_messages(folder, msgs_number, border_ID, new_folder, new_folder_name);
-        }
-
-        if (msgs_number == 'selected')
-                msgs_number = get_selected_messages();
+
+                if (openTab.type[currentTab] > 1)
+                        delete_border(currentTab,'false');
+        }
+
+        if(currentTab.toString().indexOf("_r") != -1)
+                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+        else if(msgs_number == 'selected')
+                msgs_number = get_selected_messages();
 
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0)
@@ -2372 +2377 @@
         if (folder == 'null')
                 folder = get_current_folder();
-        var new_folder          = 'INBOX'+cyrus_delimiter+'Spam';
+        var new_folder = 'INBOX'+cyrus_delimiter+'Spam';
         var new_folder_name = 'Spam';
         var handler_move_msgs = function(data){
-                // debug
-                // alert(data);
                 proxy_mensagens.proxy_move_messages(folder, msgs_number, border_ID, new_folder, new_folder_name);
-        }
-        if(msgs_number == 'selected')
+                if (openTab.type[currentTab] > 1)
+                        delete_border(currentTab,'false');
+        }
+
+        if(currentTab.toString().indexOf("_r") != -1)
+                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+        else if(msgs_number == 'selected')
                 msgs_number = get_selected_messages();
+
         if(parseInt(msgs_number) > 0 || msgs_number.length > 0)
                 cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=true"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_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+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);