Changeset 673 for trunk/expressoMail1_2/js

Timestamp:

02/06/09 16:53:27 (15 years ago)

Author:

niltonneto

Message:

Revisão 670 revertida para versionar 1.233 em TAGS.

Location:

trunk/expressoMail1_2/js

Files:

• TreeS.js (modified) (2 diffs)
• TreeShow.js (modified) (2 diffs)
• common_functions.js (modified) (5 diffs)
• doiMenuData.js (modified) (1 diff)
• drag_area.js (modified) (1 diff)
• draw_api.js (modified) (30 diffs)
• filter.js (modified) (1 diff)
• main.js (modified) (18 diffs)
• search.js (modified) (9 diffs)
• shortcut.js (modified) (1 diff)
• wfolders.js (modified) (3 diffs)

trunk/expressoMail1_2/js/TreeS.js

@@ -36 +36 @@
                 div_buttons.innerHTML = "<table border='0' cellpading='0' cellspacing='0'>"+
                                                             "<tr>"+
-                                                            "<td><input type='button' style='padding:0 .25em 0 .25em;width:auto;overflow:visible;' value='"+get_lang('New folder')+"' onclick='proxy_mensagens.proxy_create_folder()'></td>"+
+                                                            "<td><input type='button' value='"+get_lang('New folder')+"' onclick='ttreeBox.validate(\"newpast\")'></td>"+
                                                             "</tr>"+
                                                             "<tr>"+
-                                                            "<td><input type='button' style='padding:0 .25em 0 .25em;width:auto;overflow:visible;' value='"+get_lang('Delete folder')+"' onclick='proxy_mensagens.proxy_remove_folder()'></td>"+
+                                                            "<td><input type='button' value='"+get_lang('Delete folder')+"' onclick='ttreeBox.del()'></td>"+
                                                             "</tr>"+
                                                             "<tr>"+
-                                                            "<td><input type='button' style='padding:0 .25em 0 .25em;width:auto;overflow:visible;' value='"+get_lang('Rename folder')+"' onclick='proxy_mensagens.proxy_rename_folder()'></td>"+
+                                                            "<td><input type='button' value='"+get_lang('Rename folder')+"' onclick='ttreeBox.validate(\"rename\")'></td>"+
                                                             "</tr>"+
                                                             "<tr>"+
-                                                            "<td><input type='button' style='padding:0 .25em 0 .25em;width:auto;overflow:visible;' value='"+get_lang('Export messages')+"' onclick='ttreeBox.export_all_msg()'></td>"+
+                                                            "<td><input type='button' value='"+get_lang('Export messages')+"' onclick='ttreeBox.export_all_msg()'></td>"+
                                                             "</tr>"+
                                                             "<tr><td><br><br><br><br><br></td></tr>"+
-                                                            "<tr><td><input type='button' style='padding:0 .25em 0 .25em;width:auto;overflow:visible;' value='"+get_lang('Close')+"' onclick='ttree.close_win()'></td></tr>"+
+                                                            "<tr><td><input type='button' value='"+get_lang('Close')+"' onclick='ttree.close_win()'></td></tr>"+
                                                             "</table>";
                 tree.appendChild(div_buttons);          
@@ -161 +161 @@
                         folders_tree.add(nn,data[i].folder_parent);
                 }
-                //Pastas locais
-                if (preferences.use_local_messages == 1) {
-                        var n_root_local = new dNode({
-                                id: 'local_root',
-                                caption: get_lang("local messages"),
-                                plusSign: true
-                        });
-                        folders_tree.add(n_root_local, 'root');
-                        
-                        var local_folders = expresso_local_messages.list_local_folders();
-                        for (var i in local_folders) { //Coloca as pastas locais.
-                                if (local_folders[i][1] > 0) 
-                                        var nodeLocal = new dNode({
-                                                id: "local_" + local_folders[i][0],
-                                                caption: lang_folder(local_folders[i][0]) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
-                                                plusSign: 0
-                                        });
-                                else 
-                                        var nodeLocal = new dNode({
-                                                id: "local_" + local_folders[i][0],
-                                                caption: lang_folder(local_folders[i][0]),
-                                                plusSign: 0
-                                        });
-                                folders_tree.add(nodeLocal, "local_root");
-                        }
-                }
+                
                 folders_tree.draw(Element(destination));
                 n_root.changeState();

trunk/expressoMail1_2/js/TreeShow.js

@@ -98 +98 @@
                                 if(func == "newpast"){
                     var button = prompt(get_lang('Enter the name of the new folder:'),"");
-                                        
-                                        if (button.indexOf("local_") != -1  || button.toUpperCase() == "INBOX") {
-                                                alert(get_lang("cannot create folder. try other folder name"));
-                                                return false; //Não posso criar pastas contendo a string local_                                 
-                                        }
-
                                         if(trim(button) == "" || trim(button) == null){
                                                 return false;
@@ -120 +114 @@
                                         }
                     var button1 = prompt(get_lang("Enter a name for the box"), "");
-                                        if (button1.indexOf("local_") != -1 || button1.toUpperCase() == "INBOX") {
-                                                alert(get_lang("cannot create folder. try other folder name"));
-                                                return false; //Não posso criar pastas contendo a string local_                                 
-                                        }
                                         if(trim(button1) == "" || trim(button1) == null){
                                                 return false;

trunk/expressoMail1_2/js/common_functions.js

@@ -178 +178 @@
 }
 
-function download_local_attachment(url) {
+function download_attachments(msg_folder, msg_number, idx_file, msg_part, encoding, new_file_name, show_iframe){
+        div_attachment = document.getElementById("id_div_attachment");
+        var params = '';
+        
         if (div_attachment == null){
                 var div_attachment = document.createElement("DIV");
@@ -184 +187 @@
                 document.body.appendChild(div_attachment);
         }
-        div_attachment.innerHTML="<iframe style='display:none;width:0;height:0' name='attachment' src='"+url+"'></iframe>";
-}
-
-function download_attachments(msg_folder, msg_number, idx_file, msg_part, encoding, new_file_name, show_iframe){
-        div_attachment = document.getElementById("id_div_attachment");
-        var params = '';
-        
-        if (div_attachment == null){
-                var div_attachment = document.createElement("DIV");
-                div_attachment.id="id_div_attachment";
-                document.body.appendChild(div_attachment);
-        }
         if(new_file_name)
                 params = "&newfilename="+new_file_name;
@@ -210 +201 @@
         cExecute("$this.exporteml.download_all_attachments",handler_source,"folder="+msg_folder+"&num_msg="+msg_number);
 }
-//ADD forwarded files
-function addForwardedFile(id_border,file_name,link){
-        divFiles = document.getElementById("divFiles_"+id_border);
-
-        if (! divFiles)
-                return false;
-        
-        if (divFiles.lastChild)
-                var countDivFiles = parseInt(divFiles.lastChild.id.split('_')[2]) + 1;
-
-        if (! countDivFiles)
-                var countDivFiles = 1;
-        
-        divFile = document.createElement('DIV');
-        
-
-        if (!is_ie) {
-                var inputFile = document.createElement("INPUT");
-                
-                var tmp_id_border = document.createAttribute('id_border');
-                tmp_id_border.value = id_border;
-                
-                inputFile.setAttributeNode(tmp_id_border);
-                inputFile.id = "inputFile_" + id_border + "_" + countDivFiles;
-                inputFile.type = 'file';
-                inputFile.size = 50;
-                inputFile.maxLength = 255;
-                inputFile.name = 'file_' + countDivFiles;
-                inputFile.style.display = "none";
-                divFile.appendChild(inputFile);
-        }
-        else {
-                var inputFile = document.createElement("link");
-                
-                var tmp_id_border = document.createAttribute('id_border');
-                tmp_id_border.value = id_border;
-                
-                inputFile.setAttributeNode(tmp_id_border);
-                inputFile.id = "inputFile_" + id_border + "_" + countDivFiles;
-                inputFile.name = 'file_' + countDivFiles;
-                
-                
-                divFile.appendChild(inputFile);         
-        }
-
-        var a_tmp = new Array();
-        a_tmp[0] = "local_";
-        a_tmp[1] = 'file_' + countDivFiles;
-        a_tmp[2] = file_name;
-        s_tmp = escape(connector.serialize(a_tmp));
-        var checkbox = document.createElement("INPUT");
-        checkbox.type = "checkbox";
-        checkbox.id = "checkbox_"+id_border+"_"+countDivFiles;
-        checkbox.name = "local_attachments[]";
-        
-        checkbox.value = s_tmp;
-        divFile.appendChild(checkbox);
-        
-        var link_attachment = document.createElement("A");
-        link_attachment.setAttribute("href", link);
-        
-        link_attachment.innerHTML = file_name;
-        divFile.appendChild(link_attachment);
-        
-        countDivFiles++;
-        divFile.id = "divFile_"+id_border+"_"+countDivFiles;    
-        divFiles.appendChild(divFile);
-
-        divFile.id = "divFile_"+id_border+"_"+countDivFiles;    
-        divFiles.appendChild(divFile);
-        checkbox.checked = true; //Incrível, mas no Internet Explorer o checked só funciona efetivamente se o elemente já estiver renderizado... por isso só aqui eu seleciono ele...
-        return inputFile;
-}
-
 // Add Input File Dynamically.
 function addFile(id_border){
@@ -322 +239 @@
         divFile.id = "divFile_"+id_border+"_"+countDivFiles;    
         divFiles.appendChild(divFile);
-
-        return inputFile;
 }
 //      Remove Input File Dynamically.
@@ -762 +677 @@
 
  function lang_folder(fn) {
-        if (fn.toUpperCase() == "INBOX") return get_lang("Inbox");
+        if (fn == "Inbox") return get_lang("Inbox");
         if (special_folders[fn] && typeof(special_folders[fn]) == 'string') {
                 return get_lang(special_folders[fn]);
-        }       
+        }
         return fn;
  }

trunk/expressoMail1_2/js/doiMenuData.js

@@ -152 +152 @@
                 var _sep = "<hr>";
                 var optionsMenu = new Array( 
-                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('seen')+'|'+"proxy_mensagens.proxy_set_messages_flag('seen','get_selected_messages')",
-                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('unseen')+'|'+"proxy_mensagens.proxy_set_messages_flag('unseen','get_selected_messages')",
-                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('important')+'|'+"proxy_mensagens.proxy_set_messages_flag('flagged','get_selected_messages')",
-                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('normal')+'|'+"proxy_mensagens.proxy_set_messages_flag('unflagged','get_selected_messages')",
+                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('seen')+'|'+"set_messages_flag('seen','get_selected_messages')",
+                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('unseen')+'|'+"set_messages_flag('unseen','get_selected_messages')",
+                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('important')+'|'+"set_messages_flag('flagged','get_selected_messages')",
+                        _tab + get_lang("Mark as")+"&nbsp;"+get_lang('normal')+'|'+"set_messages_flag('unflagged','get_selected_messages')",
                         _sep,
                         _tab + get_lang("Move to")+" ... |wfolders.makeWindow('', 'move_to')",
-                        _tab + get_lang("Delete")+"|"+"proxy_mensagens.delete_msgs('null','selected','null')",
+                        _tab + get_lang("Delete")+"|"+"delete_msgs('null','selected','null')",
                         _tab + get_lang("Export")+"|"+"export_all_selected_msgs()"
                 );

trunk/expressoMail1_2/js/drag_area.js

@@ -216 +216 @@
                         if(new_folder_name == 'INBOX')
                                 new_folder_name = get_lang("Inbox");
-                        if (_dragArea.from_list) {
-                                if (numBox != 0) 
+                                
+                        if(_dragArea.from_list)
+                                if (numBox != 0)
                                         move_search_msgs("content_id_search_" + numBox, new_folder, new_folder_name);
-                                else 
-                                        proxy_mensagens.proxy_move_messages("null", 'selected', 0, new_folder, new_folder_name);
-                        }
-                        else {
-                                var msg_number = _dragArea.from_list ? _dragArea.msg_number : _dragArea.msg_number.replace('_r', '');
-                                proxy_mensagens.proxy_move_messages("null", msg_number, msg_number + "_r", new_folder, new_folder_name);
+                                else    
+                                        move_msgs(_dragArea.folder, 'selected', 0, new_folder, new_folder_name);
+                                
+                        else{
+                                var msg_number = _dragArea.from_list ? _dragArea.msg_number : _dragArea.msg_number.replace('_r','');
+                                move_msgs(_dragArea.folder, msg_number, msg_number+"_r", new_folder, new_folder_name);
                         }
                 }

trunk/expressoMail1_2/js/draw_api.js

@@ -53 +53 @@
                         }
                 }
-                cExecute ("$this.imap_functions.get_folders_list&folder="+current_folder, update_tree_folders);
-                
-                
-                /**
-                 * Pastas locais
-                 */
-                if(preferences.use_local_messages==1) {
-                        var local_folders = expresso_local_messages.list_local_folders();
-                        var has_changes = false;
-                        for (var i in local_folders) { //Coloca as pastas locais.
-                                var folder_unseen = Element('dftree_local_'+local_folders[i][0]+'_unseen');
-                                
-                                if ((folder_unseen) && (local_folders[i][1] > 0))
-                                {
-                                        folder_unseen.innerHTML = local_folders[i][1];
-                                        has_changes = true;
-                                }
-                                else if (local_folders[i][1] > 0)
-                                {
-                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(local_folders[i][0]) + '<font style=color:red>&nbsp(</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'});
-                                        tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
-                                        has_changes = true;
-                                }
-                                else if (local_folders[i][1] <= 0)
-                                {
-                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(local_folders[i][0])});
-                                        tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
-                                        has_changes = true;
-                                }
-        
-                                if("local_"+local_folders[i][0] == get_current_folder()){                                       
-                                        var old_new_m = isNaN(parseInt(Element('new_m').innerHTML)) ? parseInt(Element('new_m').firstChild.innerHTML) : parseInt(Element('new_m').innerHTML);
-                                        if(!isNaN(old_new_m) && old_new_m < local_folders[i][1]){
-                                                Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) + (parseInt(local_folders[i][1])-old_new_m);
-                                        }
-                                        Element('new_m').innerHTML = local_folders[i][1] ? '<font color="RED">'+local_folders[i][1]+'</font>' : 0;
-                                        draw_paging(Element('tot_m').innerHTML);
-                                        has_changes = true;
-                                }
-                        }
-                        if(has_changes)
-                                tree_folders.getNodeById("local_root").open();
-
-                }
-                
+                cExecute ("$this.imap_functions.get_folders_list", update_tree_folders);
                 return;
         }
@@ -127 +83 @@
                         tree_folders.add(nn,folders[i].folder_parent);
                 }
-                //tree_local_folders = new dFTree({name: 'tree_local_folders'});
-                /**
-                 * Pastas locais
-                 */
-                if (preferences.use_local_messages==1) {
-                        if (!window.google || !google.gears) {
-                                temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to be redirected to gears installation page?"));
-                                if (temp) {
-                                        location.href = "http://gears.google.com/?action=install&message="+
-                                        get_lang("To use local messages, install Google Gears")+"&return=" + document.location.href;
-                                }
-                                else {
-                                        preferences.use_local_messages=0;
-                                }
-                        }
-                        else{
-                                var root_local = new dNode({
-                                        id: "local_root",
-                                        caption: get_lang('local messages')
-                                });
-                                tree_folders.add(root_local, "root"); //coloca root local
-                                var local_folders = expresso_local_messages.list_local_folders();
-                                for (var i in local_folders) { //Coloca as pastas locais.
-                                        if (local_folders[i][1] > 0) 
-                                                var nodeLocal = new dNode({
-                                                        id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(local_folders[i][0]) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + local_folders[i][0] + "')",
-                                                        plusSign: 0
-                                                });
-                                        else 
-                                                var nodeLocal = new dNode({
-                                                        id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(local_folders[i][0]),
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + local_folders[i][0] + "')",
-                                                        plusSign: 0
-                                                });
-                                        tree_folders.add(nodeLocal, "local_root");
-                                }
-                        }
-                }
-
-                
-                
                 tree_folders.draw(Element('content_folders'));
                 n_root.changeState();
@@ -271 +183 @@
                         return true;
                 }
-                proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse,handler_draw_box);
-//              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);
-        }
-        else
+                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);
+        } else
                 alternate_border(0);
 }
@@ -336 +246 @@
         if(current_page != 1) {
                 lnk_page = document.createElement("A");
-                lnk_page.setAttribute("href", "javascript:current_page=1;kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+",function handler(data){draw_box(data, get_current_folder());});");
+                lnk_page.setAttribute("href", "javascript:current_page=1;kill_current_box(); draw_paging("+num_msgs+"); cExecute ('$this.imap_functions.get_range_msgs2&folder='+get_current_folder()+'&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+"', function handler(data){draw_box(data, get_current_folder());})");
         }
         else {
@@ -375 +285 @@
                         msg_range_begin = ((i*preferences.max_email_per_page)-(preferences.max_email_per_page-1));
                         msg_range_end = (i*preferences.max_email_per_page);
-                        lnk_page.setAttribute("href", "javascript:current_page="+i+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+",function handler(data){draw_box(data, get_current_folder());});");
+                        lnk_page.setAttribute("href", "javascript:current_page="+i+";kill_current_box(); draw_paging("+num_msgs+"); cExecute ('$this.imap_functions.get_range_msgs2&folder='+get_current_folder()+'&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+"', function handler(data){draw_box(data, get_current_folder());})");
                 }
                 
@@ -392 +302 @@
                 msg_range_begin = ((total_pages*preferences.max_email_per_page)-(preferences.max_email_per_page-1));
                 msg_range_end = (total_pages*preferences.max_email_per_page);           
-                lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+",function handler(data){draw_box(data, get_current_folder());});");
+                lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";kill_current_box(); draw_paging("+num_msgs+"); cExecute ('$this.imap_functions.get_range_msgs2&folder='+get_current_folder()+'&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+"', function handler(data){draw_box(data, get_current_folder());})");
         }
         else {
@@ -437 +347 @@
                         {
                                 if ((window.event.keyCode) == 46)
-                                        proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                        delete_msgs(get_current_folder(),'selected','null');
                         }
                         else
                         {
                                 if ((e.keyCode) == 46)
-                                        proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                        delete_msgs(get_current_folder(),'selected','null');
                         }
                 };
@@ -506 +416 @@
                         {
                                 //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                delete_msgs(get_current_folder(),'selected','null');
                         }
                 }
@@ -514 +424 @@
                         {
                                 //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                delete_msgs(get_current_folder(),'selected','null');
                         }
                 }
@@ -619 +529 @@
         }
 }
+function change_tr_properties(tr_element, newUid, newSubject){
+       var td_who = document.getElementById('td_who_'+tr_element.id);
+       td_who.nextSibling.innerHTML = newSubject;
+       tr_element.id = newUid;
+       for (var i=2; i < 6; i++)
+               tr_element.childNodes[i].id = tr_element.childNodes[i].id.replace(message_id,newUid);
+       tr_element.onclick = function () {   cExecute("$this.imap_functions.get_info_msg&msg_number="+newUid+"&msg_folder="+current_folder,show_msg); };
+}
 
 function make_tr_message(headers_msgs, msg_folder){
@@ -627 +545 @@
 
                 if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')){
-                        if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1))
+                        if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && preferences.use_important_flag == 'True'))
                                 add_className(tr_element, 'flagged_msg');
                         add_className(tr_element, 'tr_msg_unread');
                 }
                 else{
-                        if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1))
+                        if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && preferences.use_important_flag == 'True'))
                                 add_className(tr_element,'flagged_msg');
                         add_className(tr_element, 'tr_msg_read');
@@ -677 +595 @@
                 // preload image
                 var _img_important = new Image();
-                _img_important.src = "templates/default/images/important.gif";
-
-                if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1))
+                _img_important.src = "templates/default/images/important.gif"
+                if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && preferences.use_important_flag == 'True')){
                         td_element22.innerHTML += "<img src ='templates/default/images/important.gif' title='"+get_lang('Important')+"'>";
+                        }
                 else
                         td_element22.innerHTML += "&nbsp;&nbsp;&nbsp;";
@@ -696 +614 @@
                 td_element3.id = "td_who_"+ headers_msgs.msg_number;
                 td_element3.setAttribute("width", "30%");
-                var _onclick = function(){InfoContact.hide();proxy_mensagens.get_msg(headers_msgs.msg_number, msg_folder,true, show_msg);};
+                var _onclick = function(){InfoContact.hide();cExecute("$this.imap_functions.get_info_msg&msg_number="+ headers_msgs.msg_number + "&msg_folder=" + msg_folder, show_msg);};
                 td_element3.onclick = _onclick;
                 td_element3.innerHTML = '&nbsp;';
@@ -816 +734 @@
         search_box_type = search;
 
-        proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort,search,sort_box_reverse,handler_draw_box);
-//      cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&search_box_type="+search+"&sort_box_type="+sort+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
+        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+"&search_box_type="+search+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
         current_page = 1;
         //Comentado para nao sobrepor o numero de msgs nao lidas ao utilizar os filtros
@@ -1043 +960 @@
         option_delete.id = 'msg_opt_delete_'+ID;
         option_delete.className = 'message_options';
-        option_delete.onclick = function(){proxy_mensagens.delete_msgs(info_msg.msg_folder, info_msg.msg_number, ID);};
+        option_delete.onclick = function(){delete_msgs(info_msg.msg_folder, info_msg.msg_number, ID);};
         option_delete.innerHTML = get_lang('Delete');
         options.appendChild(space3);
@@ -1065 +982 @@
 
         var option_mark_as                                              = '<span>'+get_lang("Mark as")+'</span>: ';
-        var option_mark_as_unseen                               = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unseen\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+'.\');">'+get_lang("Unseen")+'</span>, ';
-        var option_mark_as_important                    = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, ';
-        var option_mark_as_normal                               = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span> | ';
+        var option_mark_as_unseen                               = '<span class="message_options" onclick="set_messages_flag(\'unseen\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+'.\');">'+get_lang("Unseen")+'</span>, ';
+        var option_mark_as_important                    = '<span class="message_options" onclick="set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, ';
+        var option_mark_as_normal                               = '<span class="message_options" onclick="set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span> | ';
         
         var option_move                                                 = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","move_to");>'+get_lang("Move")+'</span> | ';
@@ -1073 +990 @@
         var option_reply_without_history                = '<span class="message_options" onclick=new_message("reply_without_history","'+ID+'");>'+get_lang("Reply without history")+'</span> | ';
         var option_reply_to_all_without_history = '<span class="message_options" onclick=new_message("reply_to_all_without_history","'+ID+'");>'+get_lang("Reply to all without history")+'</span> | ';
-        var option_source_msg                                   = '<span class="message_options" onclick=proxy_mensagens.proxy_source_msg("'+ID+'","'+url_encode(info_msg.msg_folder)+'");>'+get_lang("Message Font")+'</span>';        
+        var option_source_msg                                   = '<span class="message_options" onclick=source_msg("'+ID+'","'+url_encode(info_msg.msg_folder)+'");>'+get_lang("Message Font")+'</span>';      
 
         div_other_options.innerHTML = option_mark_as + option_mark_as_unseen + option_mark_as_important + option_mark_as_normal + option_move + option_reply_to_all + option_reply_without_history + option_reply_to_all_without_history + option_source_msg;
@@ -1102 +1019 @@
                 var option_edit   = '<span class="message_options" onclick="new_message(\'edit\',\''+ID+'\');">'+get_lang('Edit')+'</span> | ';
                 var option_print = '<span class="message_options" onclick="print_msg(\''+info_msg.msg_folder+'\',\''+info_msg.msg_number+'\',\''+ID+'\');">'+get_lang('Print')+'</span> | ';
-                var option_delete = '<span class="message_options" onclick="proxy_mensagens.delete_msgs(\''+info_msg.msg_folder+'\',\''+info_msg.msg_number+'\',\''+ID+'\');">'+get_lang('Delete')+'</span> | ';                
+                var option_delete = '<span class="message_options" onclick="delete_msgs(\''+info_msg.msg_folder+'\',\''+info_msg.msg_number+'\',\''+ID+'\');">'+get_lang('Delete')+'</span> | ';                
                 var option_hide_more = document.createElement("SPAN");
                 option_hide_more.className = 'message_options';
@@ -1188 +1105 @@
         from_values.type = "HIDDEN";
         from_values.value = info_msg.from.full; //Veio do IMAP, sem images nem links.
-        
-        var local_message = document.createElement("INPUT");
-        local_message.id = "is_local_"+ID;
-        local_message.name = "is_local";
-        local_message.type = "HIDDEN";
-        local_message.value = (info_msg.local_message)?"1":"0";
-        
         tr1.appendChild(td1);
         tr1.appendChild(from);
         tr1.appendChild(from_values);
-        tr1.appendChild(local_message);
-        
-
-        
         if (info_msg.reply_to){
                 var tr11 = document.createElement("TR");
@@ -1388 +1294 @@
                 var td6 = document.createElement("TD");
                 td6.innerHTML = get_lang("Attachments: ");
-                
+
                 var attachments = document.createElement("TD");
                 td6.vAlign = "top";
                 attachments.align='left';
                 var zipped_attachments = '';
-                if(info_msg.attachments.length >= 1){
-                        var zipped_attachments  = document.createElement("TABLE");
+                if(info_msg.attachments.length >= 1) {
+                        var zipped_attachments  = document.createElement("TABLE");
                         zipped_attachments.style.marginBottom = "4px";
                         zipped_attachments.cellPadding="0";
                         zipped_attachments.cellSpacing="0";
+                        var td = document.createElement("TD");
+                        if(info_msg.attachments.length > 1) {
+                                var link_attachment     = document.createElement("A");
+                                link_attachment.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                                link_attachment.innerHTML = " "+info_msg.attachments.length+' '+get_lang('files')+' :: '+get_lang('Download all atachments');
+                                link_attachment.innerHTML += '<BR>';
+                                td.appendChild(link_attachment);
+                        }
                         var tr = document.createElement("TR");
-                        var td = document.createElement("TD");                  
-                        if(info_msg.attachments.length != 1) {
-                        var link_attachment     = document.createElement("A");
-                        link_attachment.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
-                        link_attachment.innerHTML = " "+info_msg.attachments.length+' '+get_lang('files')+' :: '+get_lang('Download all atachments');
-                        link_attachment.innerHTML += '<BR>';
-                        td.appendChild(link_attachment);
-                        }
-                        var del_attachments = document.createElement("A");
-                        del_attachments.setAttribute("href", "javascript:remove_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");                 
-                        del_attachments.innerHTML = get_lang('remove all attachments');
-                
-                        td.appendChild(del_attachments);
+                        if(preferences.remove_attachments_function)
+                        {
+                                var del_attachments = document.createElement("A");
+                                del_attachments.setAttribute("href", "javascript:remove_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                                del_attachments.innerHTML = get_lang('remove all attachments');
+                                del_attachments.appendChild(document.createElement('BR'));
+                                td.appendChild(del_attachments);
+                                tr.appendChild(td);
+                        }
                         tr.appendChild(td);
                         zipped_attachments.appendChild(tr);
-                }
-                if(zipped_attachments)
                         attachments.appendChild(zipped_attachments);
+                }
                 attachments.id = "attachments_" + ID;
                 for (var i=0; i<info_msg.attachments.length; i++){
                         var link_attachment = document.createElement("A");
-                        link_attachment.setAttribute("href", proxy_mensagens.link_anexo(info_msg,i));
-//                      link_attachment.setAttribute("href", "javascript:download_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"',"+i+",'"+info_msg.attachments[i].pid+"','"+info_msg.attachments[i].encoding+"')");
+                        link_attachment.setAttribute("href", "javascript:download_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"',"+i+",'"+info_msg.attachments[i].pid+"','"+info_msg.attachments[i].encoding+"')");
                         link_attachment.innerHTML = url_decode(info_msg.attachments[i].name);
                         msg_size = info_msg.attachments[i].fsize;
@@ -1432 +1340 @@
                         if((url_decode(info_msg.attachments[i].name).indexOf(".ics")!=-1) || (url_decode(info_msg.attachments[i].name).indexOf(".vcard")!=-1)){
                                 //Link para importar calendário
-                                var link_import_attachment = document.createElement("A");
-                                link_import_attachment.setAttribute("href","../index.php?menuaction=calendar.uiicalendar.import_from_mail&msg_folder="+info_msg.msg_folder+"&msg_number="+info_msg.msg_number+"&msg_part="+info_msg.attachments[i].pid+"&idx_file="+i+"&encoding="+info_msg.attachments[i].encoding);
-                                link_import_attachment.innerHTML=get_lang("Import to calendar")+"<br>";
+                                var link_import_attachment = new Image();
+                                link_import_attachment.src = "templates/default/images/new.png";
+                                link_import_attachment.setAttribute("onclick","javascript:import_calendar('"+info_msg.msg_folder+"&msg_number="+info_msg.msg_number+"&msg_part="+info_msg.attachments[i].pid+"&idx_file="+i+"&encoding="+info_msg.attachments[i].encoding+"');");
+                                link_import_attachment.title = get_lang("Import to calendar");
+                                link_import_attachment.align = "top";                           
+                                link_import_attachment.style.cursor = "pointer";
                                 var space = document.createElement("span");
-                                space.innerHTML = "&nbsp;&nbsp;&nbsp;&nbsp;";
+                                space.innerHTML = "&nbsp;";
                                 attachments.appendChild(link_attachment);
                                 attachments.appendChild(space);
@@ -1536 +1447 @@
         //////////////////////////////////////////////////////////////////////////////////////////////////////
 }
-
 function draw_new_message(border_ID){
         var ID = create_border("",border_ID);
@@ -1676 +1586 @@
         }
         }
-        
         td_to.appendChild(input_to);
-        
-        var forwarded_local_message = document.createElement("INPUT"); //Hidden para indicar se é um forward de uma mensagem local
-        forwarded_local_message.id = "is_local_forward"+ID;
-        forwarded_local_message.name = "is_local_forward";
-        forwarded_local_message.type = "HIDDEN";
-        forwarded_local_message.value = "0";
-        td_to.appendChild(forwarded_local_message);
         
         var img_search = document.createElement("IMG");
@@ -1931 +1833 @@
         tr5.appendChild(td_return_receipt);
         tbody_message.appendChild(tr5);
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-        var trn = document.createElement("TR");
-        var tdn = document.createElement("TD");
-        tdn.innerHTML = "&nbsp;";
-        var td_important_msg = document.createElement("TD");
-        td_important_msg.setAttribute("noWrap","true");
-        td_important_msg.innerHTML = get_lang("Important message")+":";
-        var input_important_message = document.createElement('input');
-        input_important_message.type = "checkbox";
-        input_important_message.className = "checkbox";
-        input_important_message.id = "important_message_"+ID;
-        input_important_message.name = "input_important_message";
-        input_important_message.setAttribute("tabIndex","-1");
-        td_important_msg.appendChild(input_important_message);  
-        trn.appendChild(tdn);
-        trn.appendChild(td_important_msg);
-        tbody_message.appendChild(trn);
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
+        if (preferences.use_important_flag)
+        {
+                var trn = document.createElement("TR");
+                var tdn = document.createElement("TD");
+                tdn.innerHTML = "&nbsp;";
+                var td_important_msg = document.createElement("TD");
+                td_important_msg.setAttribute("noWrap","true");
+                td_important_msg.innerHTML = get_lang("Important message")+":";
+                var input_important_message = document.createElement('input');
+                input_important_message.type = "checkbox";
+                input_important_message.className = "checkbox";
+                input_important_message.id = "important_message_"+ID;
+                input_important_message.name = "input_important_message";
+                input_important_message.setAttribute("tabIndex","-1");
+                td_important_msg.appendChild(input_important_message);  
+                trn.appendChild(tdn);
+                trn.appendChild(td_important_msg);
+                tbody_message.appendChild(trn);
+        }
         var add_files = document.createElement("A");
         add_files.setAttribute("href", "javascript:void(0)");
@@ -2248 +2150 @@
                         {
                                 //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                delete_msgs(get_current_folder(),'selected','null');
                         }
                 }
@@ -2256 +2158 @@
                         {
                                 //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                delete_msgs(get_current_folder(),'selected','null');
                         }
                 }
@@ -2355 +2257 @@
                         {
                                 //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                delete_msgs(get_current_folder(),'selected','null');
                         }
                 }
@@ -2363 +2265 @@
                         {
                                 //delete_all_selected_msgs_imap();
-                                proxy_mensagens.delete_msgs(get_current_folder(),'selected','null');
+                                delete_msgs(get_current_folder(),'selected','null');
                         }
                 }
@@ -2448 +2350 @@
 }
 function draw_footer_box(num_msgs){
-        folder = get_current_folder();
         var span_R = Element("table_message");  
         var span_options = Element("span_options");     
@@ -2459 +2360 @@
 
         span_options.innerHTML = 
-                '<span title="'+get_lang("Delete")+'" style="margin-left:8px" class="message_options" onclick=proxy_mensagens.delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span> | '+
+                '<span title="'+get_lang("Delete")+'" style="margin-left:8px" class="message_options" onclick=delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span> | '+
                 '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span> | '+
                 '<span title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span> | '+
                 '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span> | ' + 
                 '<span title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span>';
-        if(preferences.use_local_messages==1)
-                span_options.innerHTML += ' | <span title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
+        
         if (use_spam_filter) {
                 if ( get_current_folder() == 'INBOX'+cyrus_delimiter+'Spam' )   {

trunk/expressoMail1_2/js/filter.js

@@ -128 +128 @@
                                 }
                         }
-                        for(var i=0; i < nm_folders.length; i++){
-                                if(nm_folders[i].id != "root" && !proxy_mensagens.is_local_folder(nm_folders[i].id)){
+                        for(var i=0; i < nm_folders.length; i++)
+                        {
+                                if(nm_folders[i].id != "root")
+                                {
                                         var opt = new Option(nm_folders[i].caption,nm_folders[i].id,false,true);
                                         sel_nm[sel_nm.length] = opt;

trunk/expressoMail1_2/js/main.js

@@ -40 +40 @@
         cExecute ("$this.functions.get_preferences", save_preferences);
         setTimeout('auto_refresh()', time_refresh);
-}
-function disable_field(field,condition) {
-        var comando = "if ("+condition+") { document.getElementById('"+field.id+"').disabled=true;} else { document.getElementById('"+field.id+"').disabled=false; }";
-        eval(comando);
 }
 /*
@@ -240 +236 @@
 }
 
-function delete_msgs2(folder, msgs_number, border_ID, show_success_msg) {
+function delete_msgs(folder, msgs_number, border_ID)
+{
         if (folder == 'null')
                 folder = get_current_folder();
 
         if ((parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+trashfolder)){
-                move_msgs2(folder, msgs_number, border_ID, 'INBOX'+cyrus_delimiter+trashfolder,trashfolder,show_success_msg );
+                move_msgs(folder, msgs_number, border_ID, 'INBOX'+cyrus_delimiter+trashfolder,trashfolder );
                 return;
         }
@@ -274 +271 @@
                         }
                 }
-                if (show_success_msg) {
-                        if (data.msgs_number.length == 1) 
-                                write_msg(get_lang("The message was deleted."));
-                        else 
-                                write_msg(get_lang("The messages were deleted."));
-                }
+                if (data.msgs_number.length == 1)
+                        write_msg(get_lang("The message was deleted."));
+                else
+                        write_msg(get_lang("The messages were deleted."));
 
                 if (data.border_ID != 'null'){
@@ -298 +293 @@
                 write_msg(get_lang('No selected message.'));            
 }
-function delete_msgs(folder, msgs_number, border_ID)
-{ 
-        delete_msgs2(folder, msgs_number, border_ID, true);
-}
-
 
 function move_search_msgs(border_id, new_folder, new_folder_name){
         var selected_messages = '';
-        var temp_msg;
         var main_list = Element("tbody_resultsearch_"+border_id.substr(18)).childNodes; 
         for (j = 0; j < main_list.length; j++)  {
                 var check_box = main_list[j].firstChild.firstChild; 
                 if(check_box && check_box.checked) {
-                        if (proxy_mensagens.is_local_folder(main_list[j].name)) {
-                                alert(get_lang("You cant manipulate local messages on search"));
-                                return;
-                        }
                         selected_messages += main_list[j].id + ',';
                 }
         }
-
         selected_messages = selected_messages.substring(0,(selected_messages.length-1));
         var handler_move_search_msgs = function(data){
@@ -350 +334 @@
                         for (i = 0; i < selected_msg_array.length; i++){
                                 var tr = Element(selected_msg_array[i]);
-                            selected_param += ','+tr.name+';'+tr.id;
+                                selected_param += ','+tr.name+';'+tr.id;
                         }
                 }
@@ -356 +340 @@
                 {
                         var tr=Element(selected_messages);
-                        alert(tr.name);
                         selected_param=tr.name+';'+tr.id;
                 }
@@ -365 +348 @@
                         params = "&delete=true";
                 }                       
+                
                 params += "&selected_messages="+url_encode(selected_param);
                 if(new_folder) {
@@ -370 +354 @@
                         params += "&new_folder_name="+url_encode(new_folder_name);
                 }
-
                 cExecute ("$this.imap_functions.move_search_messages", handler_move_search_msgs, params);
         }
@@ -377 +360 @@
 }
 
-function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg){
-
+function move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name){
         if (! folder || folder == 'null')
                 folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : get_current_folder();
@@ -442 +424 @@
                 }
                 
-                if (show_success_msg) {
-                        if (data.msgs_number.length == 1)
-                                write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
-                        else 
-                                write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
-                }
-
+
+                if (data.msgs_number.length == 1)
+                        write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
+                else
+                        write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
                 if (data.border_ID.indexOf('r') != -1){
                         if (parseInt(preferences.delete_and_show_previous_message) && folder == get_current_folder()){
@@ -475 +455 @@
                 write_msg(get_lang('No selected message.'));            
                 
-}
-
-function move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name) {
-        move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,true);
-}
-
-function archive_msgs(folder,folder_dest,id_msgs) {
-        if(proxy_mensagens.is_local_folder(folder)) {
-                write_msg(get_lang("You cant archive local mails"));
-                return;
-        }
-        var has_local_messages_before = expresso_local_messages.has_local_mails(); //vejo se já tinha mensagens locais
-        var handler_arquivar_mensagens = function(data) {
-                var sucess = true;
-                var temp;
-                var msgs_to_remove = new Array();
-                var update_tree;
-
-
-                for (var i = 0; i < data.length; i++) {
-                        msg_info = connector.unserialize(data[i]);
-                        temp = expresso_local_messages.insert_mail(msg_info, msg_info['header'],msg_info['array_attach'],folder_dest );
-                        Element("check_box_message_" + msg_info.msg_number).checked = false;
-                        if(!temp)
-                                sucess = false;
-                        else
-                                msgs_to_remove.push(msg_info.msg_number);//As mensagens arquivadas devem ser removidas, caso o usuï¿œrio tenha isso configurado.
-                }
-                
-                if (preferences.keep_archived_messages == 0) { //Remove as mensagens
-                                delete_msgs2(folder,msgs_to_remove,'null',false);
-                }
-                update_tree=(!has_local_messages_before) && expresso_local_messages.has_local_mails();
-                
-                Element('chk_box_select_all_messages').checked = false;
-                if(update_tree)
-                        ttreeBox.update_folder();
-                else
-                        update_menu();
-                if(sucess) 
-                        write_msg(get_lang("selected messages have been archived"));
-                else
-                        write_msg(get_lang("at least, one of selected mails is already archived, expresso tried to archive the others, check them later"));
-
-        }       
-        if(!id_msgs)
-                id_msgs = get_selected_messages();
-        if (parseInt(id_msgs) > 0 || id_msgs.length > 0) 
-                cExecute("$this.imap_functions.get_info_msgs&folder=" + folder + "&msgs_number=" + id_msgs , handler_arquivar_mensagens);
-        else 
-                write_msg(get_lang('No selected message.'));
-        
 }
 
@@ -573 +501 @@
         else
                 return selected_messages;
-}
-
-function replaceAll(string, token, newtoken) {
-        while (string.indexOf(token) != -1) {
-                string = string.replace(token, newtoken);
-        }
-        return string;
 }
 
@@ -799 +720 @@
                         break;
                 case "forward":
-                        data.is_local_message = (document.getElementById("is_local_"+border_ID).value=="1")?true:false;
                         msg_forward_from = document.createElement('input');
                         msg_forward_from.id = "msg_forward_from_" + new_border_ID;
@@ -808 +728 @@
                         document.getElementById("subject_" + new_border_ID).value = "Fw: " + data.subject;
                         var divFiles = Element("divFiles_"+new_border_ID);
-                        var campo_arquivo
                         if (Element("attachments_" + border_ID)){
                                 var attachments = document.getElementById("attachments_" + border_ID).childNodes;
                                 for (var i = (attachments.length > 1 ? 1 : 0); i < attachments.length; i++){
-                                        /*Anexos ics possuem um link ao seu lado para importar para calendário, que 
-                                        não deve ser renderizado. Esse link não possui a string 
-                                        javascript:download_attachments e vem com um span antes que é um espaço em branco, 
-                                        que tb deve ser descartado*/
-                                        if((attachments[i].tagName=="SPAN") || 
-                                                        ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1)))
-                                                continue; 
                                         var link_attachment = document.createElement("A");
                                         link_attachment.setAttribute("href", attachments[i].href);
                                         link_attachment.innerHTML = attachments[i].innerHTML;
-                                        if (data.is_local_message) {//Local messages
-                                                document.getElementById("is_local_forward"+new_border_ID).value = "1";
-                                                var tmp = link_attachment.href.substring(link_attachment.href.indexOf("(") + 2);//Pula o parenteses e a aspas
-                                                tmp = tmp.substring(0, tmp.length - 2);//corta a aspas e o parenteses
-                                                tmp = replaceAll(tmp,"%20"," ");
-                                                var tempNomeArquivo = tmp.split("/");
-                                                var nomeArquivo = tempNomeArquivo[tempNomeArquivo.length-1];
-                                                nomeArquivo = nomeArquivo.substring(0,nomeArquivo.length - 4); //Anexos no gears são todos com extensão .php. tenho que tirar a extensão para ficar o nome real do arquivo.
-                                                campo_arquivo = addForwardedFile(new_border_ID,nomeArquivo,link_attachment.href);
-                                                
-                                                expresso_local_messages.getInputFileFromAnexo(campo_arquivo, tmp);
-                                        }
-                                        else {
-                                                var tmp = link_attachment.href.replace("javascript:download_attachments(", "").replace(")", "");
-                                                var a_tmp = tmp.split(',');
-                                                tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
-                                                a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                                s_tmp = escape(connector.serialize(a_tmp));                     
-
-                                                divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
-                                                divFiles.innerHTML += "<link style='border:0' name='file_"+i+"' id='inputFile_"+border_ID+i+"'/>";
-                                                divFiles.appendChild(link_attachment);
-                                        }       
+                                        var tmp = link_attachment.href.replace("javascript:download_attachments(", "").replace(")", "");
+                                        var a_tmp = tmp.split(',');
+                                        tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
+                                        a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
+                                        s_tmp = escape(connector.serialize(a_tmp));
+                                        divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
+                                        divFiles.appendChild(link_attachment);
                                 }
                         }
@@ -1208 +1104 @@
         }
                 if (message_id)
+                {
                         cExecute ("$this.imap_functions.delete_msgs&folder="+openTab.imapBox[border_id]+"&msgs_number="+message_id,handler_delete_msg);
-                
+                        if (openTab.imapBox[0] == "INBOX/"+draftsfolder)
+                        {
+                                //Update mailbox
+                                var tr_msg = document.getElementById(message_id);
+                                change_tr_properties(tr_msg, data.msg_no, data.subject);
+                        }
+                
+                }
                 var save_link = Element("save_message_options_"+border_id);
                 save_link.onclick = '';
@@ -1588 +1492 @@
                 else
                         set_message_flag(msgs_number, "unseen");
-            proxy_mensagens.proxy_move_messages(folder, msgs_number, border_ID, new_folder, new_folder_name);
+            move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
         }
 
@@ -1608 +1512 @@
                 // debug
                 // alert(data);
-                proxy_mensagens.proxy_move_messages(folder, msgs_number, border_ID, new_folder, new_folder_name);
+                move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
         }
     if(msgs_number == 'selected')
@@ -1736 +1640 @@
         wfolders.makeWindow('null','import');
 }
+function import_calendar(data){
+        function handler_import_calendar(data){
+                if(data === true){
+                        write_msg(get_lang("The event was imported successfully."));
+                }
+        }
+        if(confirm(get_lang("Do you confirm this import to your Calendar?"))){
+                        cExecute('$this.db_functions.import_vcard&msg_folder='+data,handler_import_calendar);
+        }
+}

trunk/expressoMail1_2/js/search.js

@@ -101 +101 @@
                                                      "</tr>"+
                                                      "<tr>"+
-                                                     "<td valign='top'><input type='checkBox' id='check_all_msg' name='check_all_msg'><b>" + get_lang('In all the folders') + "</b></td>"+
+                                                     "<td valign='top'><input type='checkBox' id='check_all_msg' name='check_all_msg' onclick='EsearchE.all_mailboxes()'><b>" + get_lang('In all the folders') + "</b></td>"+
                                                      "</tr>"+
                                                      "</table>"+
@@ -310 +310 @@
                         tr.id = uid_msg;
                         tr.name = mailbox;
-                        
+
                         for(var j=0 ; j <= 10 ; j++)
                         {
@@ -353 +353 @@
                                         if(td1 == "INBOX"){
                                                 var td1  = get_lang("Inbox");
-                                        }
-                                                if(proxy_mensagens.is_local_folder(td1)) {
-                                                        var td1 = this.aux_local_folder_display(td1);
                                         }
                                 }
@@ -497 +494 @@
                 if (span_options)
                         span_options.innerHTML = '<span title="'+get_lang("Delete")+'" style="margin-top:3px;margin-left:8px" class="message_options" onclick="javascript:move_search_msgs(\''+content_search.id+'\');">'+get_lang("Delete")+'</span> | '+
-                                '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindowNew(\"'+content_search.id+'\",\"move_to\",true)>'+get_lang("Move")+'</span>';
+                                '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"'+content_search.id+'\",\"move_to\")>'+get_lang("Move")+'</span>';
                 div_scroll_result.appendChild(table);
                 content_search.appendChild(div_scroll_result);  
@@ -508 +505 @@
                         if(Element("border_id_" + uid_msg + "_r")){alert(get_lang("This message is already opened!"));}
                         else{draw_message(data,create_border(url_decode(subject), uid_msg + "_r"));}
-                }
-                proxy_mensagens.get_msg(uid_msg,mailbox,false,handler_get_msg);
-                /*var args   = "$this.imap_functions.get_info_msg";
-                var params = "msg_number=" + uid_msg + "&msg_folder=" + mailbox;
-                cExecute(args,handler_get_msg,params);*/
+                        //set_msg_as_read(msgs_to_set[i], false);
+                }
+                var args   = "$this.imap_functions.get_info_msg";
+                var params = "&msg_number=" + uid_msg + "&msg_folder=" + mailbox;
+                cExecute(args+params,handler_get_msg);
 
         }
@@ -519 +516 @@
         searchE.prototype.add_mailboxes = function(){
                 var sel = Element("sel_search_nm_box1");
-                if (!proxy_mensagens.is_local_folder(this.name_box_search)) {
-                        var name_box     = this.name_box_search.split(cyrus_delimiter);
-                        if(this.name_box_search == "")
-                                return false;
-                        var name_box_def = "";
-                        if(name_box.length != 1){
-                                name_box_def = name_box[(name_box.length-1)];
-                        }else{
-                                name_box_def = get_lang("Inbox");               
-                        }
-                }
-                else {
-                        if(this.name_box_search=='local_root')
-                                return;
-                        if(this.name_box_search=='local_Inbox')
-                                name_box_def = get_lang("Inbox");
-                        else
-                                name_box_def = this.name_box_search.substr(6);//Retira o 'local_'
+                var name_box     = this.name_box_search.split(cyrus_delimiter);
+                if(this.name_box_search == "")
+                        return false;
+                var name_box_def = "";
+                if(name_box.length != 1){
+                        name_box_def = name_box[(name_box.length-1)];
+                }else{
+                        name_box_def = get_lang("Inbox");               
                 }
                 if( sel.length > 0){
@@ -606 +593 @@
                         return false;
                 }
-                var local_folders = new Array();
-                var temp;
                 
                 if(Element("check_all_msg").checked){
-                        this.all_mailboxes();
                         var nm_box = new Array;
                         for(var i=0; i < EsearchE.all_boxes.length; i++){
                                 nm_box[i] = EsearchE.all_boxes[i] + fields;
-                        }
-                        if (preferences.use_local_messages == 1) {
-                                temp = expresso_local_messages.list_local_folders();
-                                for (var x in temp) {
-                                        local_folders.push(temp[x][0]);
-                                }
                         }
                 }else{
@@ -634 +612 @@
                         for(var i=0; i < sel_combo.options.length; i++){
                                 if(sel_combo.options[i].selected == true){
-                                        if(!proxy_mensagens.is_local_folder(sel_combo.options[i].value))
-                                                nm_box[nm_box.length] = sel_combo.options[i].value + fields;
-                                        else
-                                                local_folders.push(sel_combo.options[i].value.substr(6));
+                                        nm_box[nm_box.length] = sel_combo.options[i].value + fields;
                                 }
                         }
                 }
                 var handler = function(data){
-                        var tmp;
-                        var countTmp= new Array();
-                        if (local_folders.length > 0) {
-                                tmp = expresso_local_messages.search(local_folders, fields);
-                                if (tmp!=false) {
-                                        var tmp2 = tmp.substr(2, data.length - 4);
-                                        countTmp = tmp.split('####');
-                                }
-                        }
-                        if((data == "none") && (countTmp.length==0)){alert(get_lang("None result was found."));}
-                        else if(countTmp.length > 50){alert(get_lang("More than %1 results. Please, try to refine your search.",50));}
+                        if(data == "none"){alert(get_lang("None result was found."));}
                         else if(data == "many results"){alert(get_lang("More than %1 results. Please, try to refine your search.",50));}
-                        else{EsearchE.mount_result((data=='none')?tmp:(countTmp.length==0)?data:data+tmp);}
+                        else{EsearchE.mount_result(data);}
                 }
                 var args   = "$this.imap_functions.search_msg";
@@ -714 +679 @@
                 win.open();     
         }
-        
-        searchE.prototype.aux_local_folder_display = function(folder) {
-                return "(Local) " + lang_folder(folder.substr(6));
-        }
-        
 // Cria o objeto
         var EsearchE;

trunk/expressoMail1_2/js/shortcut.js

@@ -262 +262 @@
                 
                 selected_shortcut_msgs = selected_shortcut_msgs.substring(0,(selected_shortcut_msgs.length-1));
-                proxy_mensagens.delete_msgs(current_folder, selected_shortcut_msgs, 'null');
+                delete_msgs(current_folder, selected_shortcut_msgs, 'null');
         }
         else

trunk/expressoMail1_2/js/wfolders.js

@@ -6 +6 @@
         }
 
-        cWFolders.prototype.makeWindowNew = function(border_id, type,from_search)
-        { //Infelizmente javascript não parece suportar o polimorfismo...
+        cWFolders.prototype.makeWindow = function(border_id, type)
+        {
                 _this = this;
         
@@ -60 +60 @@
                                         move_search_msgs(border_id, wfolders_tree._selected.id, wfolders_tree._selected.caption);       
                                 else{
-                                        proxy_mensagens.proxy_move_messages('null',msg_number, border_id, wfolders_tree._selected.id, wfolders_tree._selected.caption);
+                                        move_msgs('null', msg_number, border_id, wfolders_tree._selected.id, wfolders_tree._selected.caption);
                                         wfolders.alert = true;
                                 }
@@ -87 +87 @@
                 el.appendChild(butt);
 
-                wfolders_tree = new dFTree({name: 'wfolders_tree'});
-                var n_root = new dNode({id:'root', caption:get_lang("My Folders")});
-                wfolders_tree.add(n_root,'anything'); //Places the root; second argument can be anything.
+                if (!Element('dftree_wfolders_tree'))
+                {
+                        wfolders_tree = new dFTree({name: 'wfolders_tree'});
+                        var n_root = new dNode({id:'root', caption:get_lang("My Folders")});
+                        wfolders_tree.add(n_root,'anything'); //Places the root; second argument can be anything.
 
-                var folders = tree_folders.getNodesList(cyrus_delimiter);
-                for (var i=1; i<folders.length; i++)
-                {
-                        if (proxy_mensagens.is_local_folder(folders[i].id) && from_search) {
-                                continue;
+                        var folders = tree_folders.getNodesList(cyrus_delimiter);
+                        for (var i=1; i<folders.length; i++)
+                        {
+                                var nn = new dNode({id:folders[i].id, caption:lang_folder(folders[i].caption), plusSign:folders[i].plusSign});
+                                wfolders_tree.add(nn,folders[i].parent);
                         }
-                        var nn = new dNode({
-                                id: folders[i].id,
-                                caption: lang_folder(folders[i].caption),
-                                plusSign: folders[i].plusSign
-                        });
-                        wfolders_tree.add(nn, folders[i].parent);
                         
+                        wfolders_tree.draw(Element('wfolders_content_tree'));
+                        n_root.changeState();
+                        wfolders_tree.getNodeById('INBOX')._select();
                 }
-                Element('wfolders_content_tree').innerHTML = ""; //As buscas não podem incluir mover entre pastas locais, pelo menos por enquanto
-                wfolders_tree.draw(Element('wfolders_content_tree'));
-                n_root.changeState();
-                wfolders_tree.getNodeById('INBOX')._select();
                 _this.showWindow(el, type);
-        }
-
-        cWFolders.prototype.makeWindow = function(border_id, type)
-        {
-                this.makeWindowNew(border_id,type,false);
         }