Changeset 7228 for branches/2.4/expressoMail1_2/inc/class.exporteml.inc.php

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/inc/class.exporteml.inc.php (modified) (13 diffs)

branches/2.4/expressoMail1_2/inc/class.exporteml.inc.php

@@ -16 +16 @@
         var $mbox_stream;
         var $tempDir;
-        
+
         function ExportEml() {
            
@@ -50 +50 @@
                 return $sEMail;
         }
-        
+
         // create EML File.
         // Funcao alterada para tratar a exportacao
@@ -62 +62 @@
             $header    = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $id), 80, 255);
             $subject = $this->decode_subject($header->fetchsubject);
-            
+                        
             if (strlen($subject) > 60)
                 $subject = substr($subject, 0, 59);
@@ -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(html_entity_decode($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(html_entity_decode($header->fetchsubject));
 
                                 imap_close($this->mbox_stream);
@@ -388 +394 @@
                                         return false;
                                 } else {
-                                        return $tempDir.'/'.$fileName;
+                                        $return = array();
+                                        $return[] = $tempDir.'/'.$fileName;
+                                        $return[] = $subject;
+                                        return $return;
                                 }
                         }
@@ -416 +425 @@
                                 {               
                                         $file = $tempDir.'/'.$nameFileZip;
+                                        $ret[] = $file;
+                                    return $ret;  
                                 } else {
                                         $file = false;
@@ -424 +435 @@
                                 $file = false;
                         }
-
                         return $file;
                 }
@@ -453 +463 @@
                         $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(html_entity_decode($header->fetchsubject));
+
                         imap_close($this->mbox_stream);
                         if (!$fileName) {
                                 return false;
                         } else {
-                                return $tempDir.'/'.$fileName;
+                                $return = array();
+                                $return[] = $tempDir.'/'.$fileName;
+                                $return[] = $subject;
+                                return $return;
                         }
                 }