Changeset 5211 for trunk


Ignore:
Timestamp:
11/29/11 09:45:21 (12 years ago)
Author:
clairson
Message:

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

Location:
trunk/expressoMail1_2/js
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/js/draw_api.js

    r5200 r5211  
    209209                } 
    210210 
    211                 var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+trashfolder  + 'tree_folders');  
    212             var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+draftsfolder + 'tree_folders');  
    213             var sent_span  = document.getElementById('lINBOX'+cyrus_delimiter+sentfolder  + 'tree_folders');  
    214             var spam_span  = document.getElementById('lINBOX'+cyrus_delimiter+spamfolder  + 'tree_folders'); 
     211                var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Trash']  + 'tree_folders');  
     212                var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Drafts'] + 'tree_folders');  
     213                var sent_span  = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Sent'] + 'tree_folders');  
     214                var spam_span  = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Spam'] + 'tree_folders'); 
    215215                //local folders 
    216216                var sent_local_conf = this.preferences.save_in_folder.replace("INBOX"+cyrus_delimiter,"local_"); 
    217217                var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders'); 
    218                 var trash_local_span=document.getElementById('llocal_'+trashfolder+'tree_folders'); 
    219                 var draft_local_span=document.getElementById('llocal_'+draftsfolder+'tree_folders'); 
    220                 var sent_span_default=document.getElementById('llocal_'+sentfolder+'tree_folders'); 
     218                var trash_local_span=document.getElementById('llocal_'+special_folders['Trash']+'tree_folders'); 
     219                var draft_local_span=document.getElementById('llocal_'+special_folders['Drafts']+'tree_folders'); 
     220                var sent_span_default=document.getElementById('llocal_'+special_folders['Sent']+'tree_folders'); 
    221221 
    222222 
     
    247247 
    248248                draw_paging(Element('tot_m').innerHTML); 
    249                 if(document.getElementById("nINBOX"+cyrus_delimiter+trashfolder+"tree_folders")) 
     249                if(document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Trash']+"tree_folders")) 
    250250                { 
    251251                        var trash = document.createElement("SPAN"); 
     
    258258                        trash.onmouseover = function() {trash.style.color="red";}; 
    259259                        trash.onmouseout= function() {trash.style.color="#666666";}; 
    260                         document.getElementById("nINBOX"+cyrus_delimiter+trashfolder+"tree_folders").appendChild(trash); 
    261                 } 
    262                 if(document.getElementById("nINBOX"+cyrus_delimiter+spamfolder+"tree_folders")) 
     260                        document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Trash']+"tree_folders").appendChild(trash); 
     261                } 
     262                if(document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Spam']+"tree_folders")) 
    263263                { 
    264264                                                var spam = document.createElement("SPAN"); 
     
    272272                                                spam.onmouseover = function() {spam.style.color="red";}; 
    273273                                                spam.onmouseout= function() {spam.style.color="#666666";}; 
    274                                                 document.getElementById("nINBOX"+cyrus_delimiter+spamfolder+"tree_folders").appendChild(spam); 
     274                                                document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Spam']+"tree_folders").appendChild(spam); 
    275275                           } 
    276276 
     
    13631363 
    13641364                test = true; 
    1365                 if(msg_folder.indexOf(sentfolder) !=-1 ||msg_folder.indexOf(preferences.save_in_folder) !=-1 || msg_folder.replace("local_","INBOX"+cyrus_delimiter).indexOf(preferences.save_in_folder) !=-1) 
     1365                if(msg_folder.indexOf(special_folders['Sent']) !=-1 ||msg_folder.indexOf(preferences.save_in_folder) !=-1 || msg_folder.replace("local_","INBOX"+cyrus_delimiter).indexOf(preferences.save_in_folder) !=-1) 
    13661366                    test = false; 
    13671367 
  • trunk/expressoMail1_2/js/main.js

    r5200 r5211  
    539539                        {  
    540540                          var arrayFolder = folder.split(cyrus_delimiter);  
    541                           userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+trashfolder 
     541                          userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'] 
    542542                        }  
    543                                 else userTrashFolder = 'INBOX'+cyrus_delimiter+trashfolder;  
     543                                else userTrashFolder = 'INBOX'+cyrus_delimiter+special_folders['Trash'];  
    544544          
    545545                        if(openTab.type[currentTab] == 1)  
    546                                         return move_search_msgs('content_id_'+currentTab,userTrashFolder,trashfolder);  
     546                                        return move_search_msgs('content_id_'+currentTab,userTrashFolder,special_folders['Trash']);  
    547547                                         
    548548                                if(currentTab.toString().indexOf("_r") != -1)  
     
    550550                          
    551551                        if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){  
    552                                 move_msgs2(folder, msgs_number, border_ID, userTrashFolder,trashfolder,show_success_msg );  
     552                                move_msgs2(folder, msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg );  
    553553                                return; 
    554554        } 
     
    749749                        params += "&new_folder_name_move="+url_encode(new_folder_name); 
    750750                 
    751                         new_folder = 'INBOX'+cyrus_delimiter+trashfolder; 
    752                         new_folder_name = trashfolder; 
     751                        new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash']; 
     752                        new_folder_name = special_folders['Trash']; 
    753753                        params += "&selected_messages_delete="+url_encode(msg_to_delete); 
    754754                        params += "&new_folder_delete="+url_encode(new_folder); 
    755755                        cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params); 
    756756                }else if(msg_to_delete != ""){ 
    757                         new_folder = 'INBOX'+cyrus_delimiter+trashfolder; 
    758                         new_folder_name = trashfolder; 
     757                        new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash']; 
     758                        new_folder_name = special_folders['Trash']; 
    759759                        params += "&delete=true"; 
    760760                        params += "&selected_messages="+url_encode(msg_to_delete); 
     
    775775function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg, not_opem_previus){ 
    776776        not_opem_previus = typeof(not_opem_previus) != 'undefined' ? not_opem_previus : false; 
    777         if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 
     777        var folder_error = new_folder_name; 
     778        if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 
    778779            alert( "Impossivel mover mensagens que estão ainda estão sendo arquivadas." ); 
    779780            return; 
     
    789790                        if (data.match(/^(.*)TRYCREATE(.*)$/)){ 
    790791                                connector.loadScript('TreeS'); 
    791                                 var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : trashfolder; 
    792                                 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', move_to_folder)); 
     792                                var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : special_folders['Trash']; 
     793                                alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', folder_error)); 
    793794                                connector.loadScript('TreeShow'); 
    794795                                ttree.FOLDER = 'root'; 
     
    10811082{ 
    10821083    var msgs_to_remove = {}; 
    1083     var target = 'INBOX' + cyrus_delimiter + trashfolder + cyrus_delimiter + 'tmpMoveToLocal'; 
     1084    var target = 'INBOX' + cyrus_delimiter + special_folders['Trash'] + cyrus_delimiter + 'tmpMoveToLocal'; 
    10841085     
    10851086    success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success ); 
     
    12691270                        show_msg_img(border_ID.match(/^\d*/)[0], Element('input_folder_'+border_ID).value); 
    12701271                } 
    1271         var new_border_ID = draw_new_message(parseInt(border_ID)); 
    1272         if(typeof(openTab.type[new_border_ID]) != "undefined") { 
     1272        var new_border_ID = draw_new_message(parseInt(border_ID.replace('_r',''))); 
     1273         
     1274        if(typeof(openTab.type[new_border_ID]) != "undefined") { 
    12731275                if(tabTypes[type] == openTab.type[new_border_ID]) { 
    12741276                    if (type != 'edit') 
     
    28212823                if(!verify_session(data)) 
    28222824                        return; 
    2823                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder).alter({caption: get_lang("Trash")}); 
    2824                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder)._refresh(); 
     2825                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Trash']).alter({caption: get_lang("Trash")}); 
     2826                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Trash'])._refresh(); 
    28252827                update_quota(get_current_folder()); 
    28262828                if (data){ 
    28272829                        write_msg(get_lang('Your Trash folder was empty.')); 
    2828                         if (get_current_folder() == 'INBOX'+cyrus_delimiter+trashfolder){ 
     2830                        if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Trash']){ 
    28292831                                draw_paging(0); 
    28302832                                remove_rows(document.getElementById("table_box"));                               
     
    28462848                if(!verify_session(data)) 
    28472849                        return; 
    2848                 if (get_current_folder() == 'INBOX'+cyrus_delimiter+spamfolder){ 
     2850                if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Spam']){ 
    28492851                        draw_paging(0); 
    28502852                        remove_rows(document.getElementById("table_box")); 
    28512853                } 
    2852                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+spamfolder).alter({caption: get_lang("Spam")}); 
    2853                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+spamfolder)._refresh(); 
     2854                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Spam']).alter({caption: get_lang("Spam")}); 
     2855                tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Spam'])._refresh(); 
    28542856                update_quota(get_current_folder()); 
    28552857                if (data) 
     
    30103012        {        
    30113013                arrayFolder = folder.split(cyrus_delimiter); 
    3012                 new_folder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+spamfolder; 
     3014                new_folder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Spam']; 
    30133015        } 
    30143016        else 
    30153017        { 
    3016                 new_folder = 'INBOX' + cyrus_delimiter + spamfolder; 
     3018                new_folder = 'INBOX' + cyrus_delimiter + special_folders['Spam']; 
    30173019        } 
    30183020        var new_folder_name = 'Spam'; 
     
    30293031                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
    30303032        else if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){ 
    3031                 var content_search = document.getElementById('content_id_'+currentTab);  'INBOX/Trash', 'Trash', 
     3033                var content_search = document.getElementById('content_id_'+currentTab);'INBOX/Trash', 'Trash', 
    30323034                move_search_msgs('content_id_'+currentTab,  'INBOX'+cyrus_delimiter+special_folders['Spam'], special_folders['Spam']); 
    30333035                refresh(); 
     
    32163218               write_msg(data.append); 
    32173219        } 
    3218         cExecute('$this.imap_functions.ope_msg_part&msg_folder='+data+'&save_folder=INBOX'+cyrus_delimiter+trashfolder , handler_open_msg_part);         
     3220        cExecute('$this.imap_functions.ope_msg_part&msg_folder='+data+'&save_folder=INBOX'+cyrus_delimiter+special_folders['Trash'] , handler_open_msg_part);    
    32193221} 
    32203222function hack_sent_queue(data,rowid_message) { 
Note: See TracChangeset for help on using the changeset viewer.