Changeset 4416 for sandbox/2.2.0.2/expressoMail1_2/inc/class.exporteml.inc.php

Timestamp:

05/16/11 11:44:10 (13 years ago)

Author:

airton

Message:

Ticket #1887 - Redefinicao do parser de email - Todas as adequacoes feitas no parser.

File:

• sandbox/2.2.0.2/expressoMail1_2/inc/class.exporteml.inc.php (modified) (3 diffs)

sandbox/2.2.0.2/expressoMail1_2/inc/class.exporteml.inc.php

@@ -304 +304 @@
                 $body           = $this-> getBody($id_number);
                 
-                $file = "source_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].".eml";
+                $file = "source_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]."_".time().".php"; //source_[sessao]_[timestamp].php
                 $f = fopen($tempDir.'/'.$file,"w");
                 fputs($f,$header ."\r\n\r\n". $body);
@@ -351 +351 @@
                 $return_attachments = array();
 
-                $id_number = $params['num_msg'];
+                $id_number = $params['num_msg'];                
                 $attachments =unserialize(rawurldecode($params['s_attachments']));
-
-                $tempDir = $_SESSION['phpgw_info']['server']['temp_dir'];
+                
+                $tempDir = dirname( __FILE__ ) . '/../tmpLclAtt';
+                $tempSubDir = md5(microtime());
+                exec('mkdir ' . $tempDir . '/'.$tempSubDir.'; cd ' . $tempDir . '/'.$tempSubDir);
+                
                 $this-> folder = $params['folder'];
-                $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","ISO_8859-1");
+                $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8");
                 $this->connectImap();
 
@@ -366 +369 @@
                         if($i && $i == 'names')
                                 continue;
-
-                        $fileName = $_SESSION[ 'phpgw_session' ][ 'session_id' ].md5($attachment['name'].microtime());
+                        $fileNameReal = $this->remove_accents($attachment['name']);
                         $ContentType = $this->getFileType($fileNameReal);
-                        $f = fopen($tempDir . '/'.$fileName,"wb");
+                        $fileName = $fileNameReal . ".php";
+                        $f = fopen($tempDir . '/'.$tempSubDir.'/'.$fileName,"wb");
                         if(!$f)
-                                return false;
+                                return $tempDir . '/'.$tempSubDir.'/'.$fileName;                        
 
                         $fileContent = imap_fetchbody($this->mbox_stream, $id_number,$attachment['pid'], FT_UID);
-
+                        $urlPath = 'tmpLclAtt/'.$tempSubDir.'/'.$fileName;
+                        
+                        $headers = "<?php header('Content-Type: ".$ContentType."');
+                                header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+                                header('Pragma: public');
+                                header('Expires: 0'); // set expiration time
+                                header('Content-Disposition: attachment; filename=\"". addslashes($fileNameReal) ."\"');\n echo ";
+                        
                         if($attachment['encoding'] == 'base64') {
-                                $headers=imap_base64($fileContent);
+                                $headers.=" imap_base64('".$fileContent."');?>";
                         }
                         else if($attachment['encoding'] == 'quoted_printable_decode') {
-                                $headers=quoted_printable_decode($fileContent);
+                                $headers.=" quoted_printable_decode('".$fileContent."');?>";
                         }
                         else {
-                                $headers=$fileContent;
-                        }
-
+                                $headers.=" '".$fileContent."';?>";
+                        }
+                        
                         fputs($f,$headers);
 
-                        $url =  "inc/gotodownload.php?idx_file=".$tempDir .'/'.$fileName."&newfilename=".$attachment['name'];
-                        array_push($return_attachments,array('name' => $fileName,'url' => $url,'pid' =>$attachment['pid']));
+                        array_push($return_attachments,array('name' => $fileName,'url' => $urlPath,'pid' =>$attachment['pid']));
                         fclose($f);
                 }