Changeset 1518 for trunk/expressoMail1_2/inc/class.exporteml.inc.php

Timestamp:

10/20/09 15:24:08 (15 years ago)

Author:

eduardoalex

Message:

Ticket #656 - funcionalidade de arquivamento programado no expressoMail

File:

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

trunk/expressoMail1_2/inc/class.exporteml.inc.php

@@ -318 +318 @@
                         $fileNameReal = $this->remove_accents($attachment['name']);
                         $ContentType = $this->getFileType($fileNameReal);
-                        $fileName = $fileNameReal . ".php";
+                        $fileName = $fileNameReal;
+                        if(strpos($ContentType,"text")!==false ||
+                                        strpos($ContentType,"image")!==false ||
+                                        strpos($ContentType,"audio")!==false)
+                                $fileName.= ".php";
                         $f = fopen($tempDir . '/'.$tempSubDir.'/'.$fileName,"wb");
                         if(!$f)
@@ -326 +330 @@
                         $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."');?>";
-                        }
-                        else if($attachment['encoding'] == 'quoted_printable_decode') {
-                                $headers.=" quoted_printable_decode('".$fileContent."');?>";
+                        if(strpos($ContentType,"text")!==false ||
+                                        strpos($ContentType,"image")!==false ||
+                                        strpos($ContentType,"audio")!==false) {
+                                $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."');?>";
+                                }
+                                else if($attachment['encoding'] == 'quoted_printable_decode') {
+                                        $headers.="quoted_printable_decode('".$fileContent."');?>";
+                                }
+                                else {
+                                        $headers.="'".$fileContent."';?>";
+                                }
                         }
                         else {
-                                $headers.=" '".$fileContent."';?>";
+                                if($attachment['encoding'] == 'base64') {
+                                        $headers=imap_base64($fileContent);
+                                }
+                                else if($attachment['encoding'] == 'quoted_printable_decode') {
+                                        $headers=quoted_printable_decode($fileContent);
+                                }
+                                else {
+                                        $headers=$fileContent;
+                                }
                         }
                         
@@ -366 +385 @@
                 if ($strFileType == ".gif")
                         $ContentType = "image/gif";
+                if ($strFileType == ".png")
+                        $ContentType = "image/png";
                 if ($strFileType == ".jpg" || $strFileType == "jpeg")
                         $ContentType = "image/jpeg";