Changeset 5302 for trunk/expressoMail1_2/js/main.js
- Timestamp:
- 01/03/12 16:20:05 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r5292 r5302 7 7 var results_search_messages = ""; 8 8 var cabecalho = '<h4>ExpressoLivre - ExpressoMail</h4>'; 9 9 10 function mount_url_folder(folders){ 11 12 if(folders.length == 1){ 13 14 var url = cyrus_delimiter+folders[0]; 15 return url; 16 17 } else { 18 19 var url = ""; 20 for(var i = 0; i < (folders.length -1); i++){ 21 url += folders[i]+cyrus_delimiter; 22 } 23 url += folders[folders.length - 1]; 24 return url; 25 } 26 } 10 27 function init(){ 11 28 if (!is_ie) … … 546 563 userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash']; 547 564 } 548 else userTrashFolder = 'INBOX'+cyrus_delimiter+special_folders['Trash'];565 else userTrashFolder = mount_url_folder(["INBOX","Trash"]); 549 566 550 567 if(openTab.type[currentTab] == 1) … … 719 736 if(tr.getAttribute('name') == current_folder) 720 737 remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+','; 721 if ((action == 'delete' && tr.getAttribute('name') == 'INBOX'+cyrus_delimiter+special_folders['Trash']) || !(parseInt(preferences.save_deleted_msg)))738 if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg))) 722 739 { 723 740 msg_to_delete += ','+special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,""); … … 738 755 if(tr.getAttribute('name') == current_folder) 739 756 remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+','; 740 if((action == 'delete' && tr.getAttribute('name') == 'INBOX'+cyrus_delimiter+special_folders['Trash']) || !(parseInt(preferences.save_deleted_msg))){757 if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg))){ 741 758 msg_to_delete = special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,""); 742 759 }else if (!(tr.getAttribute('name') == new_folder && action != 'delete')){ … … 754 771 params += "&new_folder_name_move="+url_encode(new_folder_name); 755 772 756 new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash'];773 new_folder = mount_url_folder(["INBOX","Trash"]); 757 774 new_folder_name = special_folders['Trash']; 758 775 params += "&selected_messages_delete="+url_encode(msg_to_delete); … … 760 777 cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params); 761 778 }else if(msg_to_delete != ""){ 762 new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash'];779 new_folder = mount_url_folder(["INBOX","Trash"]); 763 780 new_folder_name = special_folders['Trash']; 764 781 params += "&delete=true"; … … 1087 1104 { 1088 1105 var msgs_to_remove = {}; 1089 var target = 'INBOX' + cyrus_delimiter + special_folders['Trash']+ cyrus_delimiter + 'tmpMoveToLocal';1106 var target = mount_url_folder(["INBOX","Trash"]) + cyrus_delimiter + 'tmpMoveToLocal'; 1090 1107 1091 1108 success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success ); … … 2563 2580 } 2564 2581 } 2565 2566 2582 2567 2583 draw_tree_folders(); … … 2962 2978 if(!verify_session(data)) 2963 2979 return; 2964 tree_folders.getNodeById( 'INBOX'+cyrus_delimiter+special_folders['Trash']).alter({caption: get_lang("Trash")});2965 tree_folders.getNodeById( 'INBOX'+cyrus_delimiter+special_folders['Trash'])._refresh();2980 tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"])).alter({caption: get_lang("Trash")}); 2981 tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"]))._refresh(); 2966 2982 update_quota(get_current_folder()); 2967 2983 if (data){ 2968 2984 write_msg(get_lang('Your Trash folder was empty.')); 2969 if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Trash']){2985 if (get_current_folder() == mount_url_folder(["INBOX","Trash"])){ 2970 2986 draw_paging(0); 2971 2987 remove_rows(document.getElementById("table_box")); … … 2987 3003 if(!verify_session(data)) 2988 3004 return; 2989 if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Spam']){3005 if (get_current_folder() == mount_url_folder(["INBOX","Spam"])){ 2990 3006 draw_paging(0); 2991 3007 remove_rows(document.getElementById("table_box")); 2992 3008 } 2993 tree_folders.getNodeById( 'INBOX'+cyrus_delimiter+special_folders['Spam']).alter({caption: get_lang("Spam")});2994 tree_folders.getNodeById( 'INBOX'+cyrus_delimiter+special_folders['Spam'])._refresh();3009 tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"])).alter({caption: get_lang("Spam")}); 3010 tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"]))._refresh(); 2995 3011 update_quota(get_current_folder()); 2996 3012 if (data) … … 3155 3171 else 3156 3172 { 3157 new_folder = 'INBOX' + cyrus_delimiter + special_folders['Spam'];3173 new_folder = mount_url_folder(["INBOX","Spam"]); 3158 3174 } 3159 3175 var new_folder_name = 'Spam'; … … 3171 3187 else if(currentTab != 0 && currentTab.indexOf("search_") >= 0){ 3172 3188 var content_search = document.getElementById('content_id_'+currentTab);'INBOX/Trash', 'Trash', 3173 move_search_msgs('content_id_'+currentTab, 'INBOX'+cyrus_delimiter+special_folders['Spam'], special_folders['Spam']);3189 move_search_msgs('content_id_'+currentTab, mount_url_folder(["INBOX","Spam"]), special_folders['Spam']); 3174 3190 refresh(); 3175 3191 return;
Note: See TracChangeset
for help on using the changeset viewer.