Changeset 5302 for trunk/expressoMail1_2/js

Timestamp:

01/03/12 16:20:05 (13 years ago)

Author:

thiago

Message:

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

Location:

trunk/expressoMail1_2/js

Files:

• draw_api.js (modified) (7 diffs)
• main.js (modified) (12 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -18 +18 @@
         'edit':5
         }
+
 var currentTab,numBox = 0; // Open Tab and num of mailboxes opened at context
 // Objeto Map, talvez o ideal fosse adicionar este objeto à Api do egroupware, e carregá-lo
@@ -23 +24 @@
 
 function draw_tree_folders(folders){
+        
         // Check if the tree folders alredy exist.
         if (Element('dftree_tree_folders')){
@@ -209 +211 @@
                 }
 
-                var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Trash']  + 'tree_folders'); 
-                var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Drafts'] + 'tree_folders'); 
-                var sent_span  = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Sent'] + 'tree_folders'); 
-                var spam_span  = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Spam'] + 'tree_folders');
+                var trash_span = document.getElementById(mount_url_folder(["lINBOX","Trash"])  + 'tree_folders'); 
+                var draft_span = document.getElementById(mount_url_folder(["lINBOX","Drafts"]) + 'tree_folders'); 
+                var sent_span  = document.getElementById(mount_url_folder(["lINBOX","Sent"]) + 'tree_folders'); 
+                var spam_span  = document.getElementById(mount_url_folder(["lINBOX","Spam"]) + 'tree_folders');
                 //local folders
                 var sent_local_conf = this.preferences.save_in_folder.replace("INBOX"+cyrus_delimiter,"local_");
@@ -247 +249 @@
 
                 draw_paging(Element('tot_m').innerHTML);
-                if(document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Trash']+"tree_folders"))
+                if(document.getElementById(mount_url_folder(["nINBOX","Trash"])+"tree_folders"))
                 {
                         var trash = document.createElement("SPAN");
@@ -258 +260 @@
                         trash.onmouseover = function() {trash.style.color="red";};
                         trash.onmouseout= function() {trash.style.color="#666666";};
-                        document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Trash']+"tree_folders").appendChild(trash);
-                }
-                if(document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Spam']+"tree_folders"))
+                        document.getElementById(mount_url_folder(["nINBOX","Trash"])+"tree_folders").appendChild(trash);
+                }
+                if(document.getElementById(mount_url_folder(["nINBOX","Spam"])+"tree_folders"))
                 {
                                                 var spam = document.createElement("SPAN");
@@ -272 +274 @@
                                                 spam.onmouseover = function() {spam.style.color="red";};
                                                 spam.onmouseout= function() {spam.style.color="#666666";};
-                                                document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Spam']+"tree_folders").appendChild(spam);
+                                                document.getElementById(mount_url_folder(["nINBOX","Spam"])+"tree_folders").appendChild(spam);
                            }
-
 
                 if(!expresso_offline)
@@ -1174 +1175 @@
         if ((preferences.use_shortcuts == '1') && (headers_msgs[0]))
                 select_msg(headers_msgs[0].msg_number, 'null', true);
+                
 
         var tdFolders  =  Element("folderscol");

trunk/expressoMail1_2/js/main.js

@@ -7 +7 @@
 var results_search_messages = ""; 
 var cabecalho = '<h4>ExpressoLivre - ExpressoMail</h4>'; 
-
+        
+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;
+        }
+}
 function init(){
         if (!is_ie)
@@ -546 +563 @@
                           userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'];  
                         } 
-                                else userTrashFolder = 'INBOX'+cyrus_delimiter+special_folders['Trash']; 
+                                else userTrashFolder = mount_url_folder(["INBOX","Trash"]); 
          
                         if(openTab.type[currentTab] == 1) 
@@ -719 +736 @@
                                 if(tr.getAttribute('name') == current_folder)
                                         remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+',';
-                                if ((action == 'delete' && tr.getAttribute('name') == 'INBOX'+cyrus_delimiter+special_folders['Trash']) || !(parseInt(preferences.save_deleted_msg)))
+                                if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg)))
                                 {
                                         msg_to_delete +=   ','+special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,"");
@@ -738 +755 @@
                         if(tr.getAttribute('name') == current_folder)
                                         remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+',';
-                        if((action == 'delete' && tr.getAttribute('name') == 'INBOX'+cyrus_delimiter+special_folders['Trash']) || !(parseInt(preferences.save_deleted_msg))){
+                        if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","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')){
@@ -754 +771 @@
                         params += "&new_folder_name_move="+url_encode(new_folder_name);
                 
-                        new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash'];
+                        new_folder = mount_url_folder(["INBOX","Trash"]);
                         new_folder_name = special_folders['Trash'];
                         params += "&selected_messages_delete="+url_encode(msg_to_delete);
@@ -760 +777 @@
                         cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params);
                 }else if(msg_to_delete != ""){
-                        new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash'];
+                        new_folder = mount_url_folder(["INBOX","Trash"]);
                         new_folder_name = special_folders['Trash'];
                         params += "&delete=true";
@@ -1087 +1104 @@
 {
     var msgs_to_remove = {};
-    var target = 'INBOX' + cyrus_delimiter + special_folders['Trash'] + cyrus_delimiter + 'tmpMoveToLocal';
+    var target = mount_url_folder(["INBOX","Trash"]) + cyrus_delimiter + 'tmpMoveToLocal';
     
     success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success );
@@ -2563 +2580 @@
                         }
                 }
-
                 
                 draw_tree_folders();
@@ -2962 +2978 @@
                 if(!verify_session(data))
                         return;
-                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Trash']).alter({caption: get_lang("Trash")});
-                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Trash'])._refresh();
+                tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"])).alter({caption: get_lang("Trash")});
+                tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"]))._refresh();
                 update_quota(get_current_folder());
                 if (data){
                         write_msg(get_lang('Your Trash folder was empty.'));
-                        if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Trash']){
+                        if (get_current_folder() == mount_url_folder(["INBOX","Trash"])){
                                 draw_paging(0);
                                 remove_rows(document.getElementById("table_box"));                              
@@ -2987 +3003 @@
                 if(!verify_session(data))
                         return;
-                if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Spam']){
+                if (get_current_folder() == mount_url_folder(["INBOX","Spam"])){
                         draw_paging(0);
                         remove_rows(document.getElementById("table_box"));
                 }
-                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Spam']).alter({caption: get_lang("Spam")});
-                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Spam'])._refresh();
+                tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"])).alter({caption: get_lang("Spam")});
+                tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"]))._refresh();
                 update_quota(get_current_folder());
                 if (data)
@@ -3155 +3171 @@
         else
         {
-                new_folder = 'INBOX' + cyrus_delimiter + special_folders['Spam'];
+                new_folder = mount_url_folder(["INBOX","Spam"]);
         }
         var new_folder_name = 'Spam';
@@ -3171 +3187 @@
         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,  'INBOX'+cyrus_delimiter+special_folders['Spam'], special_folders['Spam']);
+                move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX","Spam"]), special_folders['Spam']);
                 refresh();
                 return;