Changeset 5134 for trunk/expressoMail1_2/js/local_messages.js

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/js/local_messages.js (modified) (36 diffs)

trunk/expressoMail1_2/js/local_messages.js

@@ -8 +8 @@
     this.store = null;
     this.filterSerch = "";
-    this.folders = [];
     this.sortType = "";
 }
@@ -122 +121 @@
 
 local_messages.prototype.installGears = function (){
-    temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to install it now?"));
-    if (temp && typeof(preferences.googlegears_url) != 'undefined'){
-        if (is_ie)
-            location.href = preferences.googlegears_url + "/gears.exe";
+    
+    var ua = navigator.userAgent.toLowerCase(); // captura o userAgent
+//     alert( parseFloat(ua.substring(ua.indexOf("firefox") + 8))  );
+    var is_ff = ( ua.indexOf("linux") != -1 || ua.indexOf("windows") != -1) &&
+                  ua.indexOf("mozilla") != -1 &&
+                ( ua.indexOf("firefox") != -1 && parseFloat(ua.substring(ua.indexOf("firefox") + 8)) <= 3.6 );
+
+    if ( is_ff )
+      ext = "xpi";
+    else
+    if( typeof is_ie !== "undefined" && is_ie )
+      ext = "exe"
         else
-            location.href = preferences.googlegears_url + "/gears.xpi";
         return false;
-    }
-    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 return false;
+      
+    var confirmation = confirm(get_lang("To use local messages you have to install google gears. Would you like to install it now?"));
+
+    if ( confirmation && typeof(preferences.googlegears_url) != 'undefined' )
+            location.href = preferences.googlegears_url + "/gears." + ext;
+
+
+    return false;
 }
 
@@ -171 +179 @@
     this.dbGears.execute('create table if not exists mail' +
         ' (mail blob,original_id int,original_folder text,header blob,timestamp int,uid_usuario int,unseen int,id_folder int,' +
-        ' ffrom text, subject text, fto text, cc text, body text, size int,unique (original_id,original_folder,uid_usuario,id_folder))');
+        ' ffrom text, subject text, fto text, cc text, body text, size int, visible bool default true, unique (original_id,original_folder,uid_usuario,id_folder))');
     this.dbGears.execute('create table if not exists anexo' +
-        ' (id_mail int,nome_anexo text,url text,pid int)');
+        ' (id_mail int,nome_anexo text,url text,pid int, contentType text)');
     this.dbGears.execute('create table if not exists folders_sync' +
         ' (id_folder text,folder_name text,uid_usuario int)');
@@ -184 +192 @@
     try {
         this.dbGears.execute('alter table mail add column size int');
-    }catch(Exception) {
+    }
+    catch(Exception) {
                         
     }
+    try {
+        this.dbGears.execute('alter table mail add column visible bool default true');
+    }
+    catch(Exception) {
+    }
+    try {
+        this.dbGears.execute('alter table anexo add column contentType text');
+    }
+    catch(Exception) {
+    }
+
+
     var rs = this.dbGears.execute('select rowid,header from mail where size is null');
     while(rs.isValidRow()) {
@@ -246 +267 @@
 }
         
+sync = { length: 0, fails: [], success: [], mails: {}, archived: [] };
+
+local_messages.prototype.insert_mails = function( msgs_info, folder, complete ){
+  
+    sync.length += msgs_info.length;
+    
+    write_msg( ( sync.archived.length ?  sync.archived.length + " mensagens ja arquivadas anteriormente, " : "" )
+              + "Preparando o arquivamento de "+sync.length+ " mensagens...", true );
+
+    for( var i = 0; i < msgs_info.length; i++ )
+    {      
+        var original = url = DEFAULT_URL + "$this.exporteml.export_eml.raw&folder=" + msgs_info[i].msg_folder
+        + "&msgs_to_export=" + msgs_info[i].msg_number;
+
+        msgs_info[i].url_export_file = url;
+        msgs_info[i].dest_folder = folder;
+
+        for( var ii = 0; ii < msgs_info[i].array_attach.length; ii++ )
+        {
+            var anexo = msgs_info[i].array_attach[ii];
+
+            anexo.url = "inc/get_archive.php?msgFolder=" + msgs_info[i].msg_folder + "&msgNumber=" + msgs_info[i].msg_number + "&indexPart=" + anexo.pid;
+
+            msgs_info[i].array_attach[ii] = anexo;
+
+            sync.mails[ anexo.url ] = url;
+
+            url = anexo.url;
+        }
+
+        sync.mails[ original ] = parseInt( this.store_mail( msgs_info[i] ) );
+
+        this.capture( url, complete );
+    }
+    
+    write_msg( ( sync.archived.length ?  sync.archived.length + " mensagens ja arquivadas anteriormente, " : "" )
+              + "arquivando " + sync.length + " mensagens...", true );
+}
+
+local_messages.prototype.checkArchived = function( msgsNumber, folder ){
+    
+    var levels = [], newtree = [];
+    
+    for( var i = 0; i < oldtree.length; i++ ){
+      
+      var element = oldtree[i];
+      
+      var current = element.parent, hierarchy = [];
+      
+      while( !levels[ current.id ] )
+      {
+          levels[ current.id ] = [];
+          
+          hierarchy.push( current.id );
+
+          for( var ii = 0; ii < hierarchy.length; ii++ )
+            levels[ hierarchy[ii] ].push( 0 );
+
+          current = current.parent;
+      }
+      
+      var parent = newtree;
+          
+      for( var ii = 0; ii < levels[ element.parent ].length; ii++ )
+            parent = parent[ levels[element.parent][ii] ];
+      
+      parent[ levels[ element.id ] = parent.length ] = element;
+    }
+}
+
+local_messages.prototype.checkArchived = function( msgsNumber, folder ){
+    
+    var isArray = false;
+  
+    if( msgsNumber.join ){
+        isArray = true;
+        msgsNumber = msgsNumber.join(",");
+    }
+
+    var archived = this.isArchived( msgsNumber, folder );
+    
+    if( !archived )
+        return( isArray ? msgsNumber.split(",") : msgsNumber );
+
+    msgsNumber = "," + msgsNumber;
+    
+    for( var i = 0; i < archived.length; i++ ){
+        sync.archived[ sync.archived.length ] = archived[i];
+        msgsNumber = msgsNumber.replace( "," + archived[i], "" );
+    }
+    
+    if( !msgsNumber )
+        this.cleanup();
+
+    return( isArray ? msgsNumber.substr(1).split(",") : 
+                    ( msgsNumber ? msgsNumber.substr(1) : msgsNumber ));
+}
+
+local_messages.prototype.isArchiving = function( msgsNumber, folder ){
+    return this.isArchived( msgsNumber, folder, true );
+}
+
+local_messages.prototype.isArchived = function( msgsNumber, folder, archiving ){
+  
+    if( msgsNumber.join )
+        msgsNumber = msgsNumber.join(",");
+    
+    folder = this.get_folder_id( folder );
+    
+    var archived = [];
+  
+  try{
+      this.init_local_messages();
+
+      var sql = "select original_id from mail where id_folder = ? and original_id IN ("+msgsNumber+")" + ( archiving ? " and visible = ?" : "" );
+      var params = archiving ? [ folder, false ]: [ folder ];
+      
+      if(folder != false){
+                for( var rs = this.dbGears.execute(sql, params); rs.isValidRow() || rs.close(); rs.next() ){
+                        archived[ archived.length ] = rs.field(0);
+                }
+        }
+    }
+    catch( error ){
+                //Removido alert pois o método
+                //é usado quando move mensagens entre pastas
+ //     alert( error );
+      return( false );
+    }
+    finally{
+      this.finalize();
+    }
+    
+    return( archived.length ? archived : false );
+}
+
+local_messages.prototype.capture = function( uri, complete ){
+
+    var _this = this;
+
+    var callback = function( url, ok ){
+
+        //check if its a chained attachment url. 
+        if( typeof sync.mails[url] === "string" )
+        {
+            var content = _this.get_src( url );
+
+            //if its successful, continue to capture the chain
+            if( ok = ok || content )
+                return _this.capture( sync.mails[url], complete );
+
+            //If it's not, don't need to continue loading the attachments. 
+            //Just break the chain, search the last one chained (the message url) and finalize the process
+            while( sync.mails[url].length )
+                    url = sync.mails[url];
+        }
+
+        sync[ ok ? 'success' : 'fails' ].push( sync.mails[url] );
+
+        sync.length--;
+
+        if( sync.length )
+            return write_msg( ( sync.archived.length ?  sync.archived.length + " mensagens ja arquivadas anteriormente, " : "" )
+                              + "arquivando " + sync.length + " mensagens...", true );
+
+        clean_msg();
+        write_msg( ( sync.success.length ? "Foram arquivadas corretamente " + sync.success.length + " mensagens" : "Nenhuma mensagem arquivada" )
+                 + ( sync.archived.length ? ", " + sync.archived.length + " mensagens ja arquivadas anteriormente" : "" )
+                 + ( sync.fails.length ? ", " + sync.fails.length + " falharam" : "" ) + "." );
+
+        _this.update_mails( sync.success, sync.fails, complete );
+    }
+
+    try{
+        this.init_local_messages();
+        this.store.capture( uri, callback );
+    }
+    catch( error ){
+        console && console.log(error);
+    }
+    finally{
+        this.finalize();
+    }
+}
+
+local_messages.prototype.store_mail = function( msg_info ){
+
+    var id_mail = false;
+  
+    try {
+
+            var id_folder = this.get_folder_id( msg_info.dest_folder );
+      
+            this.init_local_messages();
+
+            //This fields needs to be separeted to search.
+            var msg_header = msg_info.header;
+            var anexos = msg_info.array_attach;
+            var login = msg_info.login;
+            var original_id = msg_info.msg_number;
+            var original_folder = msg_info.msg_folder;
+            var subject = msg_info.subject;
+            var body = msg_info.body;
+            var timestamp = msg_info.timestamp;
+            var size = msg_header.Size;
+            var from = connector.serialize(msg_info.from);
+            var to = connector.serialize(msg_info.toaddress2);
+            var cc = connector.serialize(msg_info.cc);
+            var unseen = (msg_info.Unseen == "U" )? 1 : 0;
+
+            //If the mail was archieved in the same date the user received it, the date cames with the time.
+            //here I solved it
+            msg_header.udate = (String(msg_header.udate).indexOf(":")==-1)? msg_header.udate : msg_header.aux_date;
+            // The importance attribute can be empty, and javascript consider as null causing nullpointer.
+            msg_header.Importance = msg_header.Importance || "Normal";
+
+            //do not duplicate this information
+            msg_info.from = null;
+            msg_info.subject = null;
+            msg_info.body = null;
+            msg_info.to = null;
+            msg_info.cc = null;
+            msg_header.Size=null;
+            msg_header.aux_date = null;
+
+            var mail = connector.serialize(msg_info);
+            var header = connector.serialize(msg_header);
+
+            //parse header
+            var parser = new FlagsParser(msg_header);
+            var flags = parser.parse();
+
+            this.dbGears.execute("insert into mail (mail,original_id,original_folder,header,timestamp,uid_usuario,unseen,id_folder,ffrom,subject,fto,cc,body,size,answered,flagged,recent, visible) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                                                   [mail,original_id,original_folder,header,timestamp,login,unseen,id_folder,from,subject,to,cc,body,size,flags.getAnswered(),flags.getFlagged(),flags.getRecent(), false]);
+
+            id_mail = this.dbGears.lastInsertRowId;
+
+            //insert_mail already close and open gears.
+            for (var i = 0; i < anexos.length; i++)
+                this.dbGears.execute("insert into anexo (id_mail,nome_anexo,url,pid) values (?,?,?,?)", 
+                                                        [id_mail, anexos[i]['name'],anexos[i]['url'],anexos[i]['pid']]);
+    }
+    catch (error) {
+        return( false );
+    }
+    finally{
+        this.finalize();
+    }
+
+    return( id_mail );
+}
+
+local_messages.prototype.get_folder_id = function( folder ){
+
+    var id_folder;
+    
+    folder = ( folder && folder != "local_root" )? folder.substr(6) : "Inbox";
+  
+    try
+    {
+        this.init_local_messages();
+
+        var rs = this.dbGears.execute("select rowid from folder where folder=? and uid_usuario=?",[folder,account_id]);
+
+        if(rs.isValidRow())
+              id_folder = rs.field(0);
+        else {
+              this.dbGears.execute("insert into folder (folder,uid_usuario) values (?,?)",["Inbox",account_id]);
+              id_folder = this.dbGears.lastInsertRowId;
+        }
+        
+        rs.close();
+    }
+    catch( error ){
+        return( false );
+    }
+    finally{
+        this.finalize();
+    }
+
+    return( id_folder );
+}
+
+local_messages.prototype.update_mails = function( success, fails, callback ){
+    try
+    {           
+      this.init_local_messages();
+      
+      this.dbGears.execute('update mail set visible=? where rowid IN (' + success.join(",") + ')',[ true ]);
+
+      var sql = 'select url, contentType from anexo where id_mail = ' +success;
+
+      for( var rs = this.dbGears.execute(sql); rs.isValidRow() || rs.close(); rs.next() )
+      {
+                var url = rs.field(0), contentType = rs.field(1);
+                var blob = this.store.getAsBlob( url );
+          
+                this.store.captureBlob( blob, url + "&image=thumbnail", "image/jpeg" );
+                this.store.captureBlob( blob, url + "&image=true", "image/jpeg" );
+      } 
+    }
+    catch (error) {
+                status = false;
+    }
+    finally{
+                this.finalize();
+    }
+    
+    if( callback )
+                callback( success, fails );
+                this.cleanup();
+    
+    return( status );
+}
+
+local_messages.prototype.cleanup = function(){
+
+  try{
+    this.init_local_messages();
+    
+    this.dbGears.execute('delete from mail where visible=?', [ false ]);
+    
+    sync.success = [], sync.fails = [], sync.archived = [], sync.mails = {};
+  }
+  catch(error){
+    return( false );
+  }
+  finally{
+    this.finalize();
+  }
+  
+  return( true );
+}
+
+
+
+local_messages.prototype.select_mail = function( columns, rowIds ){
+  
+    try
+    {
+        this.init_local_messages();
+        
+        if( rowIds.join )
+            rowIds = rowIds.join( "," ); 
+        
+        if( columns.join )
+            columns = columns.join( "," );
+
+        var sql = 'select '+columns+' from mail where rowid IN (' + rowIds + ')';
+        
+        var result = [];
+
+        for( var i = 0, rs = this.dbGears.execute(sql); rs.isValidRow() || rs.close() || delete ii; rs.next( i++ ) )
+
+            for( ii = 0, result[i] = {}; ii < rs.fieldCount(); ii++ )
+
+                  result[i][ rs.fieldName( ii ) ] = rs.field( ii );
+
+    }
+    catch (error) {
+        status = false;
+    }
+    finally{
+        this.finalize();
+    }
+  
+    if( result.length === 1 )
+        result = result[0];
+    
+    return( result );
+}
+
 local_messages.prototype.insert_mail = function(msg_info,msg_header,anexos,folder) {
     try {
@@ -391 +784 @@
             if(anexos[i]['url'] && anexos[i]['url'].match(/((jpg)|(jpeg)|(png)|(gif)|(bmp))/gi))
             {
-                var er_imagens = new RegExp("\\.\\/inc\\/show_embedded_attach.php\\?msg_folder=[\\w/]+\\&msg_num=[0-9]+\\&msg_part="+anexos[i]['pid']);
+                var er_imagens = new RegExp("\\.\\/get_archive.php\\?msgFolder=[\\w/]+\\&msgNumber=[0-9]+\\&indexPart="+(anexos[i]['pid']-1));
                 var Result_imagens = er_imagens.exec(retorno['body']);
                 retorno['body'] = retorno['body'].replace(Result_imagens,anexos[i]['url']);
                 if(thumbs && thumbs[i]){
-                    er_imagens = new RegExp("\\.\\/inc\\/show_thumbs.php\\?file_type=image\\/[\\w]+\\&msg_num=[0-9]+\\&msg_folder=[\\w/%]+\\&msg_part="+anexos[i]['pid']);
+                    er_imagens = new RegExp("\\.\\/inc\\/get_archive.php\\?&&msgFolder=[\\w/%]+\\msgNumber=[0-9]+\\&indexPart=0."+(anexos[i]['pid']-1)+"&image=thumbnail");
                     Result_imagens = er_imagens.exec(thumbs[i]);
                     thumbs[i] = thumbs[i].replace(Result_imagens,"'"+anexos[i]['url']+"'");
-                    er_imagens = new RegExp("\\.\\/inc\\/show_img.php\\?msg_num=[0-9]+\\&msg_folder=[\\w/%]+\\&msg_part="+anexos[i]['pid']);
+                    er_imagens = new RegExp("\\.\\/inc\\/get_archive.php\\?&msgFolder=[\\w/%]+\\msgNumber=[0-9]+\\&indexPart=0."+(anexos[i]['pid']-1)+"&image=true");
                     Result_imagens = er_imagens.exec(thumbs[i]);
                     thumbs[i] = thumbs[i].replace(Result_imagens,anexos[i]['url']);
@@ -475 +868 @@
     'ltrim(ltrim(substr(UPPER(ffrom),21,length(ffrom)),\':\'),\'"\') ' +
     'end ' +
-    'end as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? ' +
+    'end as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and mail.visible=? ' +
     mail_filter + ' order by ';
                 
@@ -496 +889 @@
 
 
-    var rs = this.dbGears.execute(sql,['%'+Element("user_email").value+'%',account_id,folder,msg_range_begin,emails_per_page]);
+    var rs = this.dbGears.execute(sql,['%'+Element("user_email").value+'%',account_id,folder,true,msg_range_begin,emails_per_page]);
     var cont = 0;
                 
-    var rs3 = this.dbGears.execute('select count(*) from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=?'+mail_filter,[account_id,folder]);
+    var rs3 = this.dbGears.execute('select count(*) from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and mail.visible=?'+mail_filter,[account_id,folder,true]);
                                 
     while (rs.isValidRow()) {
@@ -528 +921 @@
 
         retorno[cont]['msg_sample'] = new Array();
-
-        if( (preview_msg_subject == 0) && (preview_msg_tip == 0) )
-        {
             retorno[cont]['msg_sample']['body'] = "";
-        }
-        else
-        {
-            msg_body += ">";
-            msg_body=this.strip_tags(msg_body);
-            msg_body=msg_body.replace(/\&nbsp;/ig," ");
-            retorno[cont]['msg_sample']['body'] = " - " + msg_body.substr(2,msg_body.length-1);
-        }
+
 
         cont++;
@@ -562 +945 @@
     var retorno;
     var rs = this.dbGears.execute("select url from anexo where id_mail="+msg_number+" and pid = '"+pid+"'");
-    retorno = rs.field(0)
+    retorno = rs.field(0);
     this.finalize();
                 
@@ -576 +959 @@
 
 local_messages.prototype.finalize = function() {
+    if(this.dbGears)
     this.dbGears.close();
     this.dbGears = null;
 }
 
-local_messages.prototype.delete_msgs = function(msgs_number,border_ID) {
-    this.init_local_messages();
+local_messages.prototype.remove_msgs = function(msgs_number)
+{
+    this.init_local_messages();
+         
     var rs = this.dbGears.execute("select url from anexo where id_mail in ("+msgs_number+")");
     while(rs.isValidRow()) {
@@ -590 +976 @@
     this.dbGears.execute("delete from mail where rowid in ("+msgs_number+")");
     this.finalize();
-    if (msgs_number.length == 1)
-        write_msg(get_lang("The message was deleted."));
-    else
-        write_msg(get_lang("The messages were deleted."));
-                
-    mail_msg = Element("tbody_box");
-
+}
+                
+local_messages.prototype.delete_msgs = function(msgs_number,border_ID) {
+
+        if(!msgs_number)
+                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
+    
+        if(msgs_number === ""){
+                 write_msg(get_lang('No selected message.')); 
+                 return;
+        }
+
+    this.remove_msgs( msgs_number );
+        
+    mail_msg = Element("tbody_box");    
     try {
         msgs_exploded = msgs_number.split(",");
@@ -603 +997 @@
         msgs_exploded[0] = msgs_number;
     }
+        this.previous = 0;
     var msg_to_delete;
     for (var i=0; i<msgs_exploded.length; i++){
@@ -609 +1004 @@
             if ( (msg_to_delete.style.backgroundColor != '') && (preferences.use_shortcuts == '1') )
                 select_msg('null', 'down');
+            if (parseInt(preferences.delete_and_show_previous_message) && msg_to_delete && currentTab.toString().indexOf("_r") > 0)
+                for(var ii=0; ii < mail_msg.rows.length; ii++){
+                        if(mail_msg.rows[ii] === msg_to_delete){
+                                if(ii == 0){
+                                        break;
+                                }else{
+                                        this.previous = mail_msg.rows[(ii - 1)].attributes[0];
+                                        this.previous = parseInt(this.previous.value); 
+                                        break;
+                                }
+                        }
+                }
+                
             mail_msg.removeChild(msg_to_delete);
-            decrement_folder_unseen();
-        }
-    }
+                Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - 1;
+        }
+        }
+        if (msgs_exploded.length == 1){
+        write_msg(get_lang("The message was deleted."));
+    }
+    else
+        write_msg(get_lang("The messages were deleted."));
     Element('chk_box_select_all_messages').checked = false;
-    if (border_ID != 'null')
-        delete_border(border_ID,'false');
-                
+                
+         if (parseInt(preferences.delete_and_show_previous_message) && msg_to_delete && this.previous){
+                proxy_mensagens.get_msg(this.previous, folder, true, show_msg);
+        }else if(currentTab != 0){
+                delete_border(currentTab,'false');
+        }
 }
         
@@ -635 +1051 @@
     this.init_local_messages();
         var no_errors = true;
-        var rowids_to_set; // rows ids
-    var msgs_to_set; // messages ids
+    var msgs_to_set;
         var one_message = false;
     if (msgs_number == 'get_selected_messages') {
-                msgs_to_set = get_selected_messages();
-                rowids_to_set = msgs_to_set.split(",");
-                msgs_to_set = msgs_to_set.replace(/_s[^,]*/g,"").split(",");
-    }
-    else {
-        if(isNaN(parseInt(msgs_number))){       //message(s) sent to function
-            rowids_to_set = msgs_number.split(",");
-            msgs_to_set = msgs_number.replace(/_s[^,]*/g,"").split(",");
-            if (msgs_to_set.length==1) {
-                            //Just one message
-                one_message = true;
-            }
-        }else{
-            rowids_to_set = new Array();
-            msgs_to_set = new Array()
-            msgs_to_set[0] = parseInt(msgs_number);
-            rowids_to_set[0] = parseInt(msgs_number);
+                var msgs_to_set = get_selected_messages();
+                msgs_to_set= msgs_to_set.split(",");
+    }
+    else { //Just one message
             one_message = true;
-        }
+                msgs_to_set = new Array();
+                msgs_to_set[0] = msgs_number;
     }
     for (var i in msgs_to_set) {
                         
         var matches = '';//Messages comming from other tabs.
-        if(matches === this.parse_id_mail(msgs_to_set[i])) {
+        if(matches = this.parse_id_mail(msgs_to_set[i])) {
             msgs_to_set[i] = matches[1];
         }
@@ -674 +1077 @@
         switch(flag) {
             case "unseen":
-                        set_msg_as_unread(rowids_to_set[i]);
+                        set_msg_as_unread(msgs_to_set[i]);
                         header["Unseen"] = "U";
                         mail["Unseen"] = "U";
@@ -681 +1084 @@
                         break;
             case "flagged":
-                        set_msg_as_flagged(rowids_to_set[i]);
+                        set_msg_as_flagged(msgs_to_set[i]);
                         header["Flagged"] = "F";
                         mail["Flagged"] = "F";
@@ -691 +1094 @@
                                 no_errors = false;
                         else {
-                            set_msg_as_unflagged(rowids_to_set[i]);
+                            set_msg_as_unflagged(msgs_to_set[i]);
                             header["Flagged"] = "N";
                                 mail["Flagged"] = "N";
@@ -702 +1105 @@
                         mail["Unseen"] = "N";
                         mail["header"]["Unseen"] = "N";
-                        set_msg_as_read(rowids_to_set[i],true);
+                        set_msg_as_read(msgs_to_set[i],true);
                         unseen = 0;
                         break;
@@ -729 +1132 @@
         rs.close();
                         
-        if(Element("check_box_message_" + rowids_to_set[i]))
-            Element("check_box_message_" + rowids_to_set[i]).checked = false;
+        if(Element("check_box_message_" + msgs_to_set[i]))
+            Element("check_box_message_" + msgs_to_set[i]).checked = false;
         var smail=connector.serialize(mail);
         smail =smail.replace(/([^'])'([^'])('?)/g,"$1''$2$3$3");
@@ -815 +1218 @@
             temp[2] = 0;
 
-        if(sentfolder ==  preferences.save_in_folder.replace("INBOX/","") || preferences.save_in_folder.replace("INBOX/","") == trashfolder || preferences.save_in_folder.replace("INBOX/","") == draftsfolder)
+        if(sentfolder ==  preferences.save_in_folder.replace("INBOX" + cyrus_delimiter,"") || preferences.save_in_folder.replace("INBOX" + cyrus_delimiter,"") == trashfolder || preferences.save_in_folder.replace("INBOX" + cyrus_delimiter,"") == draftsfolder)
             achouSentConf= true;
 
@@ -835 +1238 @@
                 achouDrafts = true;
                 break;
-            case preferences.save_in_folder.replace("INBOX/",""):
+            case preferences.save_in_folder.replace("INBOX" + cyrus_delimiter,""):
                 retorno_defaults[2] = temp;
                 achouSentConf = true;
@@ -862 +1265 @@
             this.create_folder(draftsfolder);
         if(!achouSentConf)
-            this.create_folder(preferences.save_in_folder.replace("INBOX/",""));
+            this.create_folder(preferences.save_in_folder.replace("INBOX" + cyrus_delimiter,""));
         return this.list_local_folders();
     }
@@ -930 +1333 @@
 
 local_messages.prototype.move_messages = function(new_folder,msgs_number) {
+    
+        if(!msgs_number)
+                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
+        
     this.init_local_messages();
     var rs = this.dbGears.execute("select rowid from folder where folder=? and uid_usuario=?",[new_folder,account_id]);
@@ -938 +1345 @@
 }
 
-local_messages.prototype.setFolders = function(sFolders)
-{
-    this.folders = sFolders;
-}
-
-local_messages.prototype.getFolders = function()
-{
-    return this.folders;
-}
-
 local_messages.prototype.setFilter = function(sFilter)
 {
@@ -972 +1369 @@
 local_messages.prototype.search = function(folders,sFilter) {
     this.init_local_messages();
-    //sFilter = unescape(sFilter);
     this.setFilter(sFilter);
-    this.setFolders(folders);
     var filters = sFilter.replace(/^##|##$/g,"").split('##');
     var friendly_filters = new Array();
@@ -1017 +1412 @@
         }
     }
-    var sql = "select mail.header,folder.folder,mail.rowid,size from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario="+account_id + " and folder.folder in (";
+    var sql = "select mail.header,folder.folder,mail.rowid,size from mail inner join folder on mail.id_folder=folder.rowid where visible=? and mail.uid_usuario="+account_id + " and folder.folder in (";
     for(var fnum in folders) {
         sql+="'"+folders[fnum]+"'";
@@ -1069 +1464 @@
     sql += this.getSortType().match('^.*_REVERSE$') ? ' asc' : ' desc';
 
-    var rs = this.dbGears.execute(sql);
+    var rs = this.dbGears.execute(sql,[true]);
     var retorno = [];
     var numRec = 0;
@@ -1226 +1621 @@
     }
 
-    AJAX.open('get', url, false);
+    AJAX.open('get', encodeURI(url), false);
     AJAX.send(null);
     return AJAX.responseText;
@@ -1233 +1628 @@
 //Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Dessarquiva msgs locais pegando o codigo fonte das mesmas e mandando via POST para o servidor
 //para que elas sejam inseridas no imap pela função  imap_functions.unarchive_mail.
-local_messages.prototype.unarchive_msgs = function (folder,new_folder,msgs_number){
-
-    if(!new_folder)
-        new_folder='INBOX';
-    this.init_local_messages();
-    // alert(folder+new_folder+msgs_number);
-    var handler_unarchive = function(data)
-    {
-                if(data.error == '')
-                    write_msg(get_lang('All messages are successfully unarchived'));
-                else
-                    alert(data.error);
-    }
-
-        if(currentTab.toString().indexOf("_r") != -1){
+    local_messages.prototype.unarchive_msgs = function (folder,new_folder,msgs_number){
+
+    this.init_local_messages();
+
+        // se a aba estiver aberta e selecionada, apenas a msg da aba é movida
+        if(currentTab.toString().indexOf("_r") != -1)
             msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
-    }
-        
-    if(msgs_number =='selected' || !msgs_number)
-    {
-                msgs_number = get_selected_messages()
-                if (!msgs_number){
-                    write_msg(get_lang('No selected message.'));
-                    return;
-                }
-                var rs = this.dbGears.execute("select mail,timestamp from mail where rowid in ("+msgs_number+")");
-                var source="";
-                var flags="";
-                var timestamp="";
+        
+        if( msgs_number =='selected' || !msgs_number )
+            msgs_number = get_selected_messages();
+
+        if( !msgs_number )
+            return write_msg(get_lang('No selected message.'));
+
+        document.getElementById("overlay").style.visibility = "";
+
+        var rs = this.dbGears.execute("select mail,timestamp from mail where rowid in (" + msgs_number + ")");
+
+        var source = [], flags = [], timestamp = [];
                 
                 while(rs.isValidRow()) {
-                        mail=connector.unserialize(rs.field(0));
-                        mail.msg_source?source_tmp = escape(mail.msg_source):source_tmp = escape(this.get_src(mail.url_export_file));
-                        flags+="#@#@#@"+mail["Answered"]+":"+mail["Draft"]+":"+mail["Flagged"]+":"+mail["Unseen"];
-                        source+="#@#@#@"+source_tmp;
-                        timestamp+="#@#@#@"+rs.field(1);
+
+            var mail = connector.unserialize(rs.field(0));
+
+            flags.push( mail["Answered"]+":"+mail["Draft"]+":"+mail["Flagged"]+":"+mail["Unseen"] );
+            source.push( escape( mail.msg_source || this.get_src( mail.url_export_file ) ) );
+            timestamp.push( rs.field(1) );
+
                         rs.next();
                 }
+
                 rs.close();
                 this.finalize();
-    }
-    else
-    {
-                var rs = this.dbGears.execute("select mail,timestamp from mail where rowid="+msgs_number);
-                mail=connector.unserialize(rs.field(0));
-                var source ="";
-
-                mail.msg_source?source = escape(mail.msg_source):source = escape(this.get_src(mail.url_export_file));
-                flags = mail["Answered"]+":"+mail["Draft"]+":"+mail["Flagged"]+":"+mail["Unseen"];
-                timestamp=rs.field(1);
-                rs.close();
-                this.finalize();
-    }
-    params="&folder="+new_folder+"&source="+source+"&timestamp="+timestamp+"&flags="+flags;
-    cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
-}
+
+        write_msg( "Desarquivando " + source.length + " mensagens... ", true );
+
+        var sep = "#@#@#@";
+
+        var params = "&folder=" + ( new_folder || 'INBOX' ) +
+                     "&source=" + source.join(sep) +
+                     "&timestamp=" + timestamp.join(sep) +
+                     "&flags=" + flags.join(sep);
+
+        cExecute ("$this.imap_functions.unarchive_mail&", function(data){
+
+            clean_msg();
+            document.getElementById("overlay").style.visibility = "hidden";
+            write_msg( get_lang( data.error || 'All messages are successfully unarchived' ) );
+
+        }, params);
+        
+        update_menu(); 
+    }
 
 local_messages.prototype.get_msg_date = function (original_id, is_local){
@@ -1309 +1701 @@
         rs = this.dbGears.execute("select mail from mail where original_id="+original_id);
     }
-        if(!rs.field(0)){
-          ret=null;
-    }
-    else
-        {
     var tmp = connector.unserialize(rs.field(0));
     var ret = new Array();
@@ -1320 +1707 @@
     ret.msg_day = tmp.msg_day;
     ret.msg_hour = tmp.msg_day;
-        }
+
     rs.close();
     this.finalize();
@@ -1356 +1743 @@
     var flag = true;
     var handler_local_mesgs_to_export = function(data){
+                        var filename = 'mensagens.zip';
+
+                        if (data.match(/\.eml$/gi)) {
+                                fn_regex = /[^\/]*\.eml$/i;
+                                filename = fn_regex.exec(data);
+                        }
+
         document.getElementById('lertOverlay').style.display='none';
         document.getElementById('lertContainer').style.display='none';
         document.getElementById('lertContainer').innerHTML = '';
         flag = false;
-        download_attachments(null, null, data, null,null,'mensagens.zip');
+
+                        download_attachments(null, null, data, null, null, filename);
     }
 
@@ -1510 +1905 @@
 }
         
+local_messages.prototype.as_trash = function(){//verifica se o usuario tem a pasta lixeira no arquivamento local
+        this.init_local_messages();
+    var rs = this.dbGears.execute("select folder from folder where uid_usuario="+account_id+" and folder = \"Trash\"");
+        var check = rs.isValidRow();
+        this.finalize();
+    if(check)
+                return true;
+        else
+                return false;
+}
+
 local_messages.prototype.get_folders_to_sync = function() {//Precisa ter visibilidade ao array de linguagens.
     this.init_local_messages();
@@ -1517 +1923 @@
         temp = new Array();
         temp[0] = rs.field(0);
-        if(temp[0]=='INBOX/Drafts' ||temp[0]=='INBOX/Trash' || temp[0]=='INBOX/Sent') {
+        if(temp[0]=='INBOX' + cyrus_delimiter + 'Drafts' ||temp[0]=='INBOX' + cyrus_delimiter + 'Trash' || temp[0]=='INBOX' + cyrus_delimiter + 'Sent') {
             temp[1] = array_lang[rs.field(1).toLowerCase()];
         }
@@ -1533 +1939 @@
 local_messages.prototype.install_offline = function(urlOffline,urlIcone,uid_usuario,login,pass,redirect) {
     if (!window.google || !google.gears) {
-        temp = confirm(document.getElementById('lang_gears_redirect').value);
-        if (temp) {
             expresso_local_messages.installGears();
-        }
         return;
-
     }