Changeset 6745 for sandbox

Timestamp:

07/09/12 15:23:03 (12 years ago)

Author:

marcosw

Message:

Ticket #2947 - Melhoria na exportação de mensagem individual

Location:

sandbox/2.4.2-expresso3/expressoMail1_2

Files:

• inc/class.exporteml.inc.php (modified) (10 diffs)
• js/common_functions.js (modified) (1 diff)
• js/main.js (modified) (1 diff)

sandbox/2.4.2-expresso3/expressoMail1_2/inc/class.exporteml.inc.php

@@ -16 +16 @@
         var $mbox_stream;
         var $tempDir;
-        
+
         function ExportEml() {
            
@@ -214 +214 @@
                 // se encontram em um mesmo folder
                 if (count($sorted_msgs)==1){
-                                                        
                         $array_names_keys = array_keys($sorted_msgs);
                         $this->folder = mb_convert_encoding($array_names_keys[0], "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP");
@@ -228 +227 @@
                                 $fileName       = $this->CreateFileEml($sEMLData, $tempDir, $msg_number[0]."_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]);
                 
-                                
+                                $header    = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $msg_number[0]), 80, 255);
+                $subject = $this->decode_subject($header->fetchsubject);
+
                                 imap_close($this->mbox_stream);
                                 if (!$fileName) {
                                         return false;
                                 }else{
-                                        return $tempDir.'/'.$fileName;
+                                        $return = array();
+                                        $return[] = $tempDir.'/'.$fileName;
+                                        $return[] = $subject;
+                                        return $return;
                                 }
                         }
@@ -271 +275 @@
                         }
 
-                        return $file;
+                        return $file;                   
                 
                 //exporta mensagens de diferentes pastas
@@ -362 +366 @@
                                 $file = false;
                         }
-
             return $file;
                 
@@ -369 +372 @@
                 {
                         $this-> folder = $params['folder'];
-                                $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP");
+                        $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP");
                         $array_ids = explode(',', $params['msgs_to_export']);
                         $error = False;
@@ -383 +386 @@
                                 $sEMLData       = $this->parseEml($header, $body);                     
                                 $fileName       = $this->CreateFileEml($sEMLData, $tempDir, $array_ids[0]."_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]);
+                        
+                                $header    = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $array_ids[0]), 80, 255);
+                    $subject = $this->decode_subject($header->fetchsubject);
 
                                 imap_close($this->mbox_stream);
@@ -388 +394 @@
                                         return false;
                                 } else {
-                                        return $tempDir.'/'.$fileName;
+                                        $return = array();
+                                        $return[] = $tempDir.'/'.$fileName;
+                                        $return[] = $subject;
+                                        return $return;
                                 }
                         }
@@ -424 +433 @@
                                 $file = false;
                         }
-
                         return $file;
                 }
@@ -453 +461 @@
                         $fileName       = $this->CreateFileEml($sEMLData, $tempDir, $array_ids[0]."_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]);
 
+                        $header    = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $array_ids[0]), 80, 255);
+            $subject = $this->decode_subject($header->fetchsubject);
+
                         imap_close($this->mbox_stream);
                         if (!$fileName) {
                                 return false;
                         } else {
-                                return $tempDir.'/'.$fileName;
+                                $return = array();
+                                $return[] = $tempDir.'/'.$fileName;
+                                $return[] = $subject;
+                                return $return;
                         }
                 }

sandbox/2.4.2-expresso3/expressoMail1_2/js/common_functions.js

@@ -825 +825 @@
         var num_msg = id_msg.substr(0,(id_msg.length - 2));
         var handler_source = function(data){
-                download_attachments(null, null, data, null,null,'fonte_da_mensagem.eml');
+                download_attachments(null, null, data[0], null,null,data[1]+'.eml');
         }
         cExecute("$this.exporteml.export_msg",handler_source,"folder="+url_decode(folder)+"&msgs_to_export="+num_msg);

sandbox/2.4.2-expresso3/expressoMail1_2/js/main.js

@@ -3485 +3485 @@
                 else{
                         var filename = 'mensagens.zip'; 
-                        if (data.match(/\.eml$/gi)) { 
-                                filename = 'fonte_da_mensagem.eml'; 
+                        if (data[0].match(/\.eml$/gi)) { 
+                filename = data[1]+'.eml'; 
                         } 
                         download_attachments(null, null, data, null,null,filename);