Changeset 7184

Timestamp:

09/10/12 12:05:54 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Implementação parcial arquivar por drag/drop (mover)

Location:

sandbox/2.5.0-expresso1/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/mail_archiver.js (modified) (1 diff)
• js/main.js (modified) (2 diffs)

sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -5444 +5444 @@
         return($this->functions->CalculateDateOffset());
     }
-    
+
     //MailArchiver -> get message flags only, invoked at archive operation
+    //Marcosw início - modificação da estrutura da função, removendo estr. de repetição desnecessária
     function get_msg_flags($args){       
                 $msg_folder = $args['folder'];
         $msg_n = $args['msg_number'];
         
-        $arr_msg = explode(",", $msg_n);
-       
-        for($i=0; $i<count($arr_msg); $i++){
-                        
-            if(!$this->mbox || !is_resource($this->mbox))
-                $this->mbox = $this->open_mbox($msg_folder);
-        
-            if(!is_resource($this->mbox))
-                return(false);
-                       
-            $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $arr_msg[$i]), 80, 255);
-                
-            if (!is_object($header))
-                return false;
-
-            $taglist[$i]["msgid"] = $msg_n;
-            $taglist[$i]["unseen"] = $header->Unseen;
-            $taglist[$i]["recent"] = $header->Recent;
-            $taglist[$i]["flagged"] = $header->Flagged;
-            $taglist[$i]["draft"] = $header->Draft;
-            $taglist[$i]["answered"] = $header->Answered;
-            $taglist[$i]["deleted"] = $header->Deleted;
-        
-            if($header->Answered =='A' && $header->Draft == 'X')
-                $taglist[$i]['forwarded'] = 'F';
-            else
-                $taglist[$i]['forwarded'] = ' ';
-        
-            if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']) {
-                $flag = preg_match('/importance *: *(.*)\r/i',imap_fetchheader($this->mbox, imap_msgno($this->mbox, $arr_msg[$i])),$importance);
-                $taglist[$i]["importance"] = $flag==0?"Normal":$importance[1];
-            }
+        if(!$this->mbox || !is_resource($this->mbox))
+            $this->mbox = $this->open_mbox($msg_folder);
+    
+        if(!is_resource($this->mbox))
+            return(false);
+          
+        $a = imap_msgno($this->mbox, $msg_n);          
+        $header = @imap_headerinfo($this->mbox, $a, 80, 255);
+                
+        if (!is_object($header))
+            return false;
+
+        $taglist["msgid"] = $msg_n;
+        $taglist["unseen"] = $header->Unseen;
+        $taglist["recent"] = $header->Recent;
+        $taglist["flagged"] = $header->Flagged;
+        $taglist["draft"] = $header->Draft;
+        $taglist["answered"] = $header->Answered;
+        $taglist["deleted"] = $header->Deleted;
+    
+        if($header->Answered =='A' && $header->Draft == 'X')
+            $taglist['forwarded'] = 'F';
+        else
+            $taglist['forwarded'] = ' ';
+    
+        if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']) {
+            $flag = preg_match('/importance *: *(.*)\r/i',imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_n)),$importance);
+            $taglist["importance"] = $flag==0?"Normal":$importance[1];
         }
+
                 return $taglist;        
     }    
+    // Marcosw fim
         /* Airton
          * Fim dos métodos 

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

@@ -527 +527 @@
     }
     else{
-        document.getElementById('main_title').innerHTML = get_lang("All done. End of archive messages operation");
+        //document.getElementById('main_title').innerHTML = get_lang("All done. End of archive messages operation");
+        //Marcosw inicio - Melhoria na exibição de mensagem
+        write_msg(get_lang("All done. End of archive messages operation"));
+        //Marcosw fim
         expresso_mail_archive.resetObject();
         expresso_mail_archive.archivefolder = null;

sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js

@@ -1595 +1595 @@
 
 /* function archive_msgs(folder,folder_dest,id_msgs) {
+    write_msg(get_lang('Starting to archive messages'));
+
+    if(currentTab.toString().indexOf("_r") != -1){
+        id_msgs = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+    }
+
+    if(!id_msgs)
+        id_msgs = get_selected_messages();
+
+    if(folder_dest=='local_root' || folder_dest==null)//Default archive destiny = local_inbox folder
+        folder_dest = 'local_inbox';
+    
+    if (parseInt(id_msgs) > 0 || id_msgs.length > 0){       
+        expresso_mail_archive.Archive(folder,folder_dest,id_msgs);
+    }
+    else
+        write_msg(get_lang('No selected message.'));
+
+
+
+        /*
         if(proxy_mensagens.is_local_folder(folder)) {
                 write_msg(get_lang("You cant archive local mails"));
@@ -1631 +1652 @@
         var handler_arquivar_mensagens = function(data) {
           
-            var msgs_info = [];
+            //var msgs_info = [];
           
-            for( var i = 0; i < data.length; i++ )
-                msgs_info[i] = connector.unserialize( data[i] );
+            //for( var i = 0; i < data.length; i++ )
+                //msgs_info[i] = connector.unserialize( data[i] );
 
             //vejo se já tinha mensagens locais
-            var h = expresso_local_messages.has_local_mails();
+            //var h = expresso_local_messages.has_local_mails();
             
-            expresso_local_messages.insert_mails( msgs_info, folder_dest, function( s, f ){complete_archiving( s, f, h )} );
-
+            //expresso_local_messages.insert_mails( msgs_info, folder_dest, function( s, f ){complete_archiving( s, f, h )} );
+
+            expresso_mail_archive.Archive(folder,folder_dest,id_msgs);
             document.getElementById("overlay").style.visibility = "hidden";
         }