Changeset 7888 for sandbox/2.5.1-expresso1/expressoMail1_2/js/mail_archiver.js

Timestamp:

02/18/13 13:48:17 (11 years ago)

Author:

thiago

Message:

Ticket #3331 - Implementado a parte de arquivamento, e colocado informações em ingles.

File:

• sandbox/2.5.1-expresso1/expressoMail1_2/js/mail_archiver.js (modified) (9 diffs)

sandbox/2.5.1-expresso1/expressoMail1_2/js/mail_archiver.js

@@ -575 +575 @@
 }
 
-
-
-
-
-
-
-
-
-
-
-
 MailArchiver.prototype.unarchieveToAttach = function (folder, new_folder, msgs_number){
-    try{ 
+    try{
+
+        if(typeof(expresso_mail_archive.idMsgsToAttach) == "undefined"){
+            expresso_mail_archive.idMsgsToAttach = new Array();
+        }
         //write_msg(get_lang("Starting to unarchive messages"));
         expresso_mail_archive.isArchiveOperation = true;
@@ -599 +592 @@
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){       
            
-            expresso_mail_archive.message_list = new Array();
-            expresso_mail_archive.message_list.push(msgs_number);
-            if((expresso_mail_archive.message_list.length > 0) && (expresso_mail_archive.message_list[0] != '')) {
+            expresso_mail_archive.messageToAttach = msgs_number;
+            if(expresso_mail_archive.messageToAttach) {
                 
-                expresso_mail_archive.unarchieveToAttachHandler();
-
                 expresso_mail_archive.unarchivecounter = 0;
                 expresso_mail_archive.unarchive_error_counter=0;
@@ -611 +601 @@
                 (new_folder != null)?expresso_mail_archive.unarchievenewfolder = new_folder:expresso_mail_archive.unarchievenewfolder='INBOX';
                 
-                
+                expresso_mail_archive.unarchieveToAttachHandler();
                 
                 if(currentTab.toString().indexOf("_r") != -1){
@@ -631 +621 @@
 }
 
-/**
- *
- *Unarchieve Message Handler
- *
- *@author Cassiano Dal Pizzol [cassiano.dalpizzol@serpro.gov.br]
- *
- **/
 MailArchiver.prototype.unarchieveToAttachHandler = function(){
-
-    try{
-        var email = mail_archive_protocol+'://'+mail_archive_host+':'+mail_archive_port+'/mail/' + expresso_mail_archive.session.id +'/'+ expresso_mail_archive.folder.path + '/'+ expresso_mail_archive.message_list[0] + '.eml';    
+    try{
+        var email = mail_archive_protocol+'://'+mail_archive_host+':'+mail_archive_port+'/mail/' + expresso_mail_archive.session.id +'/'+ expresso_mail_archive.folder.path + '/'+ expresso_mail_archive.messageToAttach + '.eml';    
     
         //Creates a new object to unarchive messages. It's a CXF Add-on CORS component
@@ -651 +633 @@
             for (var w=0; w < expresso_mail_archive.allcompletemessagesbyfolder.length; w++){
                                 
-                if(expresso_mail_archive.allcompletemessagesbyfolder[w]["msg_number"] == expresso_mail_archive.message_list[expresso_mail_archive.unarchivecounter]){
+                if(expresso_mail_archive.allcompletemessagesbyfolder[w]["msg_number"] == expresso_mail_archive.messageToAttach){
                     var timestamp = expresso_mail_archive.allcompletemessagesbyfolder[w]["timestamp"];
                     
@@ -706 +688 @@
                 }
             }
-            var id = expresso_mail_archive.message_list[expresso_mail_archive.unarchivecounter];
+            var id = expresso_mail_archive.messageToAttach;
             var source =  encodeURIComponent(UnarchiveReqHandler.handler.responseText) + "#@#@#@";
             var params = 
@@ -716 +698 @@
             "&id="          + id;
 
+
             var handler_unarchive = function(data){
                 expresso_mail_archive.unarchieveToAttachController(data);
-
-
-            }
-            write_msg(get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length));
+            }
+            write_msg(get_lang("Please, Wait the messages from archieve be ready."));
             
-            //cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
-
              $.ajax({
                 url: "controller.php?action=$this.imap_functions.unarchive_mail",
+                success: function(data){
+                    data = connector.unserialize(data);
+                    expresso_mail_archive.idMsgsToAttach.push(data.idsMsg);
+                    handler_unarchive(data);
+                },
+                async: false,
                 data:  params,
                 type: 'POST',
-                async: false,
-                success: function(data){
-                    handler_unarchive(connector.unserialize(data));
-                },
-            }); 
-
-        }
+                
+            });
+
+        }
+
         
         UnarchiveReqHandler.handler.open("GET", email, true);
@@ -748 +731 @@
 }
 
-/**
- *
- *Unarchieve Message Controller
- *
- *@author Cassiano Dal Pizzol [cassiano.dalpizzol@serpro.gov.br]
- *
- **/
 MailArchiver.prototype.unarchieveToAttachController = function(data){
-    expresso_mail_archive.unarchivecounter++;
     
     if (data){
@@ -763 +738 @@
         }
         
-        if (data.archived && preferences.keep_archived_messages == "0") {
-            expresso_mail_archive.deleteMessages(data.archived[0]);
-        }
-        
-    }
-
-    if (expresso_mail_archive.unarchivecounter < expresso_mail_archive.message_list.length){
-        expresso_mail_archive.unarchieveHandler();
-    } else {
-        expresso_mail_archive.message_list = new Array();
-        expresso_mail_archive.isArchiveOperation = false;
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    }
+}