Changeset 2425


Ignore:
Timestamp:
04/06/10 09:33:07 (14 years ago)
Author:
amuller
Message:

Ticket #1026 - fazendo teste de troca de this por expressoMail

Location:
trunk/expressoMail1_2/js
Files:
2 edited

Legend:

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

    r2424 r2425  
    116116                        } 
    117117                        expresso.connector.cacheNextRequest(1); 
    118                         cExecute ("$this.imap_functions.get_folders_list&folder=INBOX", update_tree_folders); 
     118                        cExecute ("expressoMail1_2.imap_functions.get_folders_list&folder=INBOX", update_tree_folders); 
    119119                } 
    120120         
     
    337337                                                setTimeout("expresso.connector.loadScript('TreeShow');ttreeBox.update_folder();",500); 
    338338                                } 
    339                                 cExecute("$this.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create); 
     339                                cExecute("expressoMail1_2.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create); 
    340340                        } 
    341341                } 
     
    464464                } 
    465465                proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box); 
    466 //              cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 
     466//              cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 
    467467        } 
    468468        else 
     
    480480                        return true; 
    481481                } 
    482                 cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 
     482                cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 
    483483        } 
    484484        else 
     
    799799        else if(msg_folder && msg_number){ 
    800800                expresso.connector.cacheNextRequest(); 
    801                 cExecute("$this.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), show_msg); 
     801                cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+ msg_number + "&msg_folder=" + url_encode(msg_folder), show_msg); 
    802802                Element('msg_folder').value = ''; 
    803803                Element('msg_number').value = ''; 
     
    11371137 
    11381138        // Old 
    1139         //img_next_msg.onclick = function () {cExecute ("$this.imap_functions.get_info_next_msg&msg_number="+ info_msg.msg_number + "&msg_folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type +  "&search_box_type="+ search_box_type +"&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)}; 
     1139        //img_next_msg.onclick = function () {cExecute ("expressoMail1_2.imap_functions.get_info_next_msg&msg_number="+ info_msg.msg_number + "&msg_folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type +  "&search_box_type="+ search_box_type +"&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)}; 
    11401140    var folder_id = 0; 
    11411141    folder_id = info_msg.original_ID ? info_msg.original_ID: info_msg.msg_number; 
     
    11571157                openTab.type[ID] = 2; 
    11581158                            proxy_mensagens.get_msg(folder.nextSibling.id,nextMsgBox,true,show_msg); 
    1159                 //cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg); 
     1159                //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg); 
    11601160            }; 
    11611161        } 
     
    11791179                    msg_range_begin = (msg_range_end-(preferences.max_email_per_page)+1); 
    11801180                    kill_current_box(); 
    1181                     cExecute ('$this.imap_functions.get_range_msgs2&folder='+current_folder+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, current_folder);}) */ 
     1181                    cExecute ('expressoMail1_2.imap_functions.get_range_msgs2&folder='+current_folder+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, current_folder);}) */ 
    11821182                        delete_border(ID); 
    11831183                }; 
     
    11931193 
    11941194        //Old 
    1195         //img_previous_msg.onclick = function () {cExecute ("$this.imap_functions.get_info_previous_msg&msgs_number="+ info_msg.msg_number + "&folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type+ "&search_box_type="+ search_box_type + "&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)} 
     1195        //img_previous_msg.onclick = function () {cExecute ("expressoMail1_2.imap_functions.get_info_previous_msg&msgs_number="+ info_msg.msg_number + "&folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type+ "&search_box_type="+ search_box_type + "&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)} 
    11961196        //folder = document.getElementById(ID.substr(0, ID.indexOf('_'))); 
    11971197        if (!folder){ 
     
    12111211                currentTab = ID; 
    12121212                openTab.type[ID] = 2; 
    1213                 //cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg); 
     1213                //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg); 
    12141214                            proxy_mensagens.get_msg(folder.previousSibling.id,previousMsgBox,true,show_msg); 
    12151215            }; 
     
    26652665        } 
    26662666        // First time, so execute..... 
    2667         cExecute ("$this.ldap_functions.getSharedUsersFrom&uids="+sharedUsers.join(';'), h_user); 
     2667        cExecute ("expressoMail1_2.ldap_functions.getSharedUsersFrom&uids="+sharedUsers.join(';'), h_user); 
    26682668} 
    26692669 
     
    28002800 
    28012801function update_quota(folder_id){ 
    2802         cExecute ("$this.imap_functions.get_quota&folder_id="+folder_id,build_quota); 
     2802        cExecute ("expressoMail1_2.imap_functions.get_quota&folder_id="+folder_id,build_quota); 
    28032803} 
    28042804 
  • trunk/expressoMail1_2/js/main.js

    r2422 r2425  
    1414                if (preferences.use_local_messages == 1 && window.google && google.gears)  
    1515                        if (expresso_local_messages.is_offline_installed())  
    16                                 expresso_local_messages.capt_url('controller.php?action=$this.db_functions.get_dropdown_contacts_to_cache'); 
     16                                expresso_local_messages.capt_url('controller.php?action=expressoMail1_2.db_functions.get_dropdown_contacts_to_cache'); 
    1717 
    1818        } 
     
    2020                 
    2121                preferences = data; 
    22                  cExecute ("$this.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1", handler_draw_box); 
     22                 cExecute ("expressoMail1_2.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1", handler_draw_box); 
    2323 
    2424                if(preferences.hide_folders == "1") 
     
    2626                 
    2727                if (preferences.delete_trash_messages_after_n_days != 0) 
    28                         cExecute ("$this.imap_functions.automatic_trash_cleanness&before_date="+preferences.delete_trash_messages_after_n_days+"&cyrus_delimiter="+cyrus_delimiter, handler_automatic_trash_cleanness); 
     28                        cExecute ("expressoMail1_2.imap_functions.automatic_trash_cleanness&before_date="+preferences.delete_trash_messages_after_n_days+"&cyrus_delimiter="+cyrus_delimiter, handler_automatic_trash_cleanness); 
    2929                 
    3030                if(preferences.outoffice == "1") 
     
    6060        // Fim da inserção da applet 
    6161 
    62                 cExecute ("$this.db_functions.get_dropdown_contacts", save_contacts); //Save contacts needs preferences. 
    63                 cExecute ("$this.imap_functions.get_folders_list&onload=true", update_menu); 
     62                cExecute ("expressoMail1_2.db_functions.get_dropdown_contacts", save_contacts); //Save contacts needs preferences. 
     63                cExecute ("expressoMail1_2.imap_functions.get_folders_list&onload=true", update_menu); 
    6464                 
    6565        } 
     
    7676        cyrus_delimiter = Element('cyrus_delimiter').value; 
    7777 
    78         cExecute ("$this.functions.get_preferences", save_preferences); 
     78        cExecute ("expressoMail1_2.functions.get_preferences", save_preferences); 
    7979        setTimeout('auto_refresh()', time_refresh); 
    8080 
     
    106106        cyrus_delimiter = Element('cyrus_delimiter').value; 
    107107         
    108         cExecute ("$this.db_functions.get_dropdown_contacts_to_cache", function(data) {contacts = data;}); 
    109         //cExecute ("$this.functions.get_preferences", save_preferences); 
     108        cExecute ("expressoMail1_2.db_functions.get_dropdown_contacts_to_cache", function(data) {contacts = data;}); 
     109        //cExecute ("expressoMail1_2.functions.get_preferences", save_preferences); 
    110110        } 
    111111} 
     
    203203        }; 
    204204        if (confirm(get_lang("delete all attachments confirmation"))) 
    205                 cExecute ("$this.imap_functions.remove_attachments&folder=" 
     205                cExecute ("expressoMail1_2.imap_functions.remove_attachments&folder=" 
    206206                                +folder+"&msg_num="+msg_num, call_back); 
    207207} 
     
    287287            /*  var confNotification = confirm(get_lang("The sender waits your notification of reading. Do you want to confirm this?"), ""); 
    288288                if (confNotification)*/ 
    289             //        cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 
     289            //        cExecute ("expressoMail1_2.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 
    290290           // } 
    291291 
     
    363363 
    364364                        if (confNotification) 
    365                                 cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 
     365                                cExecute ("expressoMail1_2.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 
    366366                } 
    367367                //Change msg class to read. 
     
    460460        string_msgs_in_main = tmp.substring(0,(tmp.length-1)); 
    461461        if(!expresso_offline) 
    462                 cExecute ("$this.imap_functions.refresh&folder="+current_folder+"&msgs_existent="+string_msgs_in_main+"&msg_range_begin="+msg_range_begin+"&msg_range_end="+msg_range_end+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_refresh); 
     462                cExecute ("expressoMail1_2.imap_functions.refresh&folder="+current_folder+"&msgs_existent="+string_msgs_in_main+"&msg_range_begin="+msg_range_begin+"&msg_range_end="+msg_range_end+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_refresh); 
    463463} 
    464464 
     
    516516                        var previous_msg = msg_to_delete.previousSibling.id; 
    517517                        expresso.connector.cacheNextRequest(); 
    518                         cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(current_folder), show_msg); 
     518                        cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(current_folder), show_msg); 
    519519                    }                
    520520                                else 
     
    539539        { 
    540540                expresso.connector.purgeCache(); 
    541                 cExecute ("$this.imap_functions.delete_msgs&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_delete_msgs); 
     541                cExecute ("expressoMail1_2.imap_functions.delete_msgs&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_delete_msgs); 
    542542        } 
    543543        else 
     
    628628                        params += "&new_folder_name="+url_encode(new_folder_name); 
    629629                } 
    630                 cExecute ("$this.imap_functions.move_search_messages", handler_move_search_msgs, params); 
     630                cExecute ("expressoMail1_2.imap_functions.move_search_messages", handler_move_search_msgs, params); 
    631631        } 
    632632        else 
     
    673673                                if (msg_to_delete.previousSibling){ 
    674674                                        var previous_msg = msg_to_delete.previousSibling.id; 
    675                                         //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg); 
     675                                        //cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg); 
    676676                                        expresso.connector.cacheNextRequest(); 
    677                                         cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg); 
     677                                        cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg); 
    678678                                } 
    679679                                else 
     
    770770        { 
    771771                expresso.connector.purgeCache(); 
    772                 cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_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, handler_move_msgs); 
     772                cExecute ("expressoMail1_2.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_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, handler_move_msgs); 
    773773        } 
    774774        else 
     
    795795        if (parseInt(id_msgs) > 0 || id_msgs.length > 0) 
    796796                expresso_mail_sync.archive_msgs(folder,folder_dest,id_msgs);  
    797                 //cExecute("$this.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs , handler_arquivar_mensagens); 
     797                //cExecute("expressoMail1_2.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs , handler_arquivar_mensagens); 
    798798        else  
    799799                write_msg(get_lang('No selected message.')); 
     
    848848                id_msgs = get_selected_messages(); 
    849849        if (parseInt(id_msgs) > 0 || id_msgs.length > 0)  
    850                 cExecute("$this.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs , handler_arquivar_mensagens); 
     850                cExecute("expressoMail1_2.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs , handler_arquivar_mensagens); 
    851851        else  
    852852                write_msg(get_lang('No selected message.'));*/ 
     
    15121512                { 
    15131513                        expresso.connector.purgeCache(); 
    1514                         cExecute ("$this.imap_functions.delete_msgs&folder="+openTab.imapBox[ID]+"&msgs_number="+openTab.imapUid[ID],function(data){ return }); 
     1514                        cExecute ("expressoMail1_2.imap_functions.delete_msgs&folder="+openTab.imapBox[ID]+"&msgs_number="+openTab.imapUid[ID],function(data){ return }); 
    15151515                } 
    15161516                delete_border(ID,'true'); // Becarefull: email saved automatically should be deleted. delete_border erase information about openTab 
     
    15611561                } 
    15621562                para="&source="+smime+"&ID="+ID+"&folder="+folder; 
    1563                 cExecute ("$this.imap_functions.show_decript&", handler, para); 
     1563                cExecute ("expressoMail1_2.imap_functions.show_decript&", handler, para); 
    15641564        }else 
    15651565        { 
     
    15941594        form.appendChild(textArea); 
    15951595 
    1596         cExecuteForm ("$this.imap_functions.send_mail", form, handler_send_smime, ID); 
     1596        cExecuteForm ("expressoMail1_2.imap_functions.send_mail", form, handler_send_smime, ID); 
    15971597    } 
    15981598} 
     
    16901690        } 
    16911691        else  
    1692                 cExecuteForm("$this.imap_functions.send_mail", form, handler_send_message, ID); 
     1692                cExecuteForm("expressoMail1_2.imap_functions.send_mail", form, handler_send_message, ID); 
    16931693} 
    16941694function change_tr_properties(tr_element, newUid, newSubject){ 
     
    17011701        var openNewMessage = function () { 
    17021702                expresso.connector.cacheNextRequest(); 
    1703                 cExecute("$this.imap_functions.get_info_msg&msg_number="+newUid 
     1703                cExecute("expressoMail1_2.imap_functions.get_info_msg&msg_number="+newUid 
    17041704                                +"&msg_folder="+url_encode(current_folder),show_msg); 
    17051705        }; 
     
    18371837                if (message_id) 
    18381838                { 
    1839                         cExecute ("$this.imap_functions.delete_msgs&folder="+openTab.imapBox[border_id]+"&msgs_number="+message_id,handler_delete_msg); 
     1839                        cExecute ("expressoMail1_2.imap_functions.delete_msgs&folder="+openTab.imapBox[border_id]+"&msgs_number="+message_id,handler_delete_msg); 
    18401840                        if (openTab.imapBox[0] == "INBOX/"+draftsfolder) 
    18411841                        { 
     
    19211921        form.appendChild(input_insertImg); 
    19221922 
    1923         cExecuteForm ("$this.imap_functions.save_msg", form, handler_save_msg,border_id);        
     1923        cExecuteForm ("expressoMail1_2.imap_functions.save_msg", form, handler_save_msg,border_id);      
    19241924} 
    19251925 
     
    19641964        form.appendChild(input_folder); 
    19651965         
    1966         cExecuteForm ("$this.imap_functions.save_msg", form, handler_save_msg,border_id); 
     1966        cExecuteForm ("expressoMail1_2.imap_functions.save_msg", form, handler_save_msg,border_id); 
    19671967} 
    19681968 
     
    20222022        { 
    20232023                expresso.connector.purgeCache(); 
    2024                 cExecute ("$this.imap_functions.set_messages_flag&folder="+folder+"&msgs_to_set="+msgs_to_set+"&flag="+flag, handler_set_messages_flag); 
     2024                cExecute ("expressoMail1_2.imap_functions.set_messages_flag&folder="+folder+"&msgs_to_set="+msgs_to_set+"&flag="+flag, handler_set_messages_flag); 
    20252025        } 
    20262026        else 
     
    20392039                } 
    20402040        } 
    2041         cExecute ("$this.imap_functions.set_messages_flag&folder="+( msg_number_folder ?  msg_number_folder.value : get_current_folder() )+"&msgs_to_set="+msg_number+"&flag="+flag, handler_set_messages_flag); 
     2041        cExecute ("expressoMail1_2.imap_functions.set_messages_flag&folder="+( msg_number_folder ?  msg_number_folder.value : get_current_folder() )+"&msgs_to_set="+msg_number+"&flag="+flag, handler_set_messages_flag); 
    20422042} 
    20432043 
     
    21912191        if (realyEmptyTrash){ 
    21922192                expresso.connector.purgeCache(); 
    2193                 cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder", handler_empty_trash); 
     2193                cExecute ("expressoMail1_2.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder", handler_empty_trash); 
    21942194        } 
    21952195} 
     
    22122212        var realyEmptySpam=confirm(get_lang('Do you really want to empty your spam folder?')); 
    22132213        if (realyEmptySpam) 
    2214                 cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder", handler_empty_spam); 
     2214                cExecute ("expressoMail1_2.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder", handler_empty_spam); 
    22152215} 
    22162216 
     
    22332233         
    22342234        if (msgs_to_export) { 
    2235                 cExecute ("$this.exporteml.makeAll", handler_export_all_selected_msgs, "folder="+get_current_folder()+"&msgs_to_export="+msgs_to_export); 
     2235                cExecute ("expressoMail1_2.exporteml.makeAll", handler_export_all_selected_msgs, "folder="+get_current_folder()+"&msgs_to_export="+msgs_to_export); 
    22362236                write_msg(get_lang('You must wait while the messages will be exported...')); 
    22372237        } 
     
    22852285        
    22862286        if (parseInt(msgs_number) > 0 || msgs_number.length > 0) 
    2287                 cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=false"+"&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); 
     2287                cExecute ("expressoMail1_2.imap_functions.spam&folder="+folder+"&spam=false"+"&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); 
    22882288        else 
    22892289                write_msg(get_lang('No selected message.')); 
     
    23032303                msgs_number = get_selected_messages(); 
    23042304        if(parseInt(msgs_number) > 0 || msgs_number.length > 0) 
    2305                 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); 
     2305                cExecute ("expressoMail1_2.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); 
    23062306        else 
    23072307        write_msg(get_lang('No selected message.')); 
     
    23792379        write_msg(get_lang('You must wait while the messages will be imported...')); 
    23802380         
    2381         cExecuteForm('$this.imap_functions.import_msgs', document.form_import, handler); 
     2381        cExecuteForm('expressoMail1_2.imap_functions.import_msgs', document.form_import, handler); 
    23822382} 
    23832383function return_import_msgs(data, wfolders_tree){ 
     
    23982398                        { 
    23992399                                archive_msgs('INBOX/Lixeira/tmpMoveToLocal',wfolders_tree._selected.id,data); 
    2400                                 cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal'); 
     2400                                cExecute('expressoMail1_2.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal'); 
    24012401                        } 
    24022402                         else{ 
     
    24472447        } 
    24482448        if(confirm(get_lang("Do you confirm this import to your Calendar?"))){ 
    2449                         cExecute('$this.db_functions.import_vcard&msg_folder='+data,handler_import_calendar); 
     2449                        cExecute('expressoMail1_2.db_functions.import_vcard&msg_folder='+data,handler_import_calendar); 
    24502450        } 
    24512451} 
     
    24912491        } 
    24922492 
    2493         cExecuteForm("$this.imap_functions.send_mail", msg_to_send, handler_send_queue_message,"queue_"+ID_tmp); 
     2493        cExecuteForm("expressoMail1_2.imap_functions.send_mail", msg_to_send, handler_send_queue_message,"queue_"+ID_tmp); 
    24942494} 
    24952495 
Note: See TracChangeset for help on using the changeset viewer.