Changeset 5306 for trunk/expressoMail1_2/js/main.js

Timestamp:

01/04/12 14:55:54 (13 years ago)

Author:

thiago

Message:

Ticket #2350 - Deixar dinamico o nome das pastas no codigo

File:

• trunk/expressoMail1_2/js/main.js (modified) (14 diffs)

trunk/expressoMail1_2/js/main.js

@@ -9 +9 @@
         
 function mount_url_folder(folders){
-        
-        if(folders.length == 1){
-                
-                var url = cyrus_delimiter+folders[0];
-                return url;
-                
-        } else {
-        
-        var url = "";
-        for(var i = 0; i < (folders.length -1); i++){
-                url += folders[i]+cyrus_delimiter;
-        }
-        url += folders[folders.length - 1];
-        return url;
-        }
+        return folders.join(cyrus_delimiter);
 }
 function init(){
@@ -547 +533 @@
 
 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){
-                        
+                                                
                         if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){
                           alert( "Impossivel deletar mensagens que estão ainda estão sendo arquivadas." );
@@ -563 +549 @@
                           userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'];  
                         } 
-                                else userTrashFolder = mount_url_folder(["INBOX","Trash"]); 
+                                else userTrashFolder = mount_url_folder(["INBOX",special_folders["Trash"]]); 
          
                         if(openTab.type[currentTab] == 1) 
@@ -632 +618 @@
                 write_msg(get_lang('No selected message.'));
 }
-
 
   
@@ -728 +713 @@
 
         if (selected_messages){
+                
                 var selected_param = "";
                 if (selected_messages.indexOf(',') != -1)
@@ -736 +722 @@
                                 if(tr.getAttribute('name') == current_folder)
                                         remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+',';
-                                if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg)))
+                                
+                                if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX",special_folders["Trash"]])) || !(parseInt(preferences.save_deleted_msg)))
                                 {
                                         msg_to_delete +=   ','+special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,"");
@@ -755 +742 @@
                         if(tr.getAttribute('name') == current_folder)
                                         remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+',';
-                        if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg))){
+                        if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX",special_folders["Trash"]])) || !(parseInt(preferences.save_deleted_msg))){
                                 msg_to_delete = special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,"");
                         }else if (!(tr.getAttribute('name') == new_folder && action != 'delete')){
@@ -771 +758 @@
                         params += "&new_folder_name_move="+url_encode(new_folder_name);
                 
-                        new_folder = mount_url_folder(["INBOX","Trash"]);
+                        new_folder = mount_url_folder(["INBOX",special_folders["Trash"]]);
                         new_folder_name = special_folders['Trash'];
                         params += "&selected_messages_delete="+url_encode(msg_to_delete);
@@ -777 +764 @@
                         cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params);
                 }else if(msg_to_delete != ""){
-                        new_folder = mount_url_folder(["INBOX","Trash"]);
+                        new_folder = mount_url_folder(["INBOX",special_folders["Trash"]]);
                         new_folder_name = special_folders['Trash'];
                         params += "&delete=true";
@@ -1104 +1091 @@
 {
     var msgs_to_remove = {};
-    var target = mount_url_folder(["INBOX","Trash"]) + cyrus_delimiter + 'tmpMoveToLocal';
+    var target = mount_url_folder(["INBOX",special_folders["Trash"],'tmpMoveToLocal']);
     
     success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success );
@@ -2978 +2965 @@
                 if(!verify_session(data))
                         return;
-                tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"])).alter({caption: get_lang("Trash")});
-                tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"]))._refresh();
+                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]])).alter({caption: get_lang("Trash")});
+                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]]))._refresh();
                 update_quota(get_current_folder());
                 if (data){
                         write_msg(get_lang('Your Trash folder was empty.'));
-                        if (get_current_folder() == mount_url_folder(["INBOX","Trash"])){
+                        if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Trash"]])){
                                 draw_paging(0);
                                 remove_rows(document.getElementById("table_box"));                              
@@ -3003 +2990 @@
                 if(!verify_session(data))
                         return;
-                if (get_current_folder() == mount_url_folder(["INBOX","Spam"])){
+                if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Spam"]])){
                         draw_paging(0);
                         remove_rows(document.getElementById("table_box"));
                 }
-                tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"])).alter({caption: get_lang("Spam")});
-                tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"]))._refresh();
+                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]])).alter({caption: get_lang("Spam")});
+                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]]))._refresh();
                 update_quota(get_current_folder());
                 if (data)
@@ -3171 +3158 @@
         else
         {
-                new_folder = mount_url_folder(["INBOX","Spam"]);
+                new_folder = mount_url_folder(["INBOX",special_folders["Spam"]]);
         }
         var new_folder_name = 'Spam';
@@ -3186 +3173 @@
                 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
         else if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){
-                var content_search = document.getElementById('content_id_'+currentTab);'INBOX/Trash', 'Trash',
-                move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX","Spam"]), special_folders['Spam']);
+                var content_search = document.getElementById('content_id_'+currentTab);mount_url_folder(["INBOX",special_folders['Trash']]), 'Trash',
+                move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX",special_folders["Spam"]]), special_folders['Spam']);
                 refresh();
                 return;