Changeset 3369 for branches/2.2/expressoMail1_2/inc

Timestamp:

10/18/10 13:48:42 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1293 - Acerta encaminhamento de msgs com nome de anexo com caracteres especiais.

Location:

branches/2.2/expressoMail1_2/inc

Files:

• class.imap_functions.inc.php (modified) (3 diffs)
• gotodownload.php (modified) (6 diffs)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1809 +1809 @@
                 ##
                 # @AUTHOR Rodrigo Souza dos Santos
-                # @DATE 2008/09/17
+                # @DATE 2008/09/17$fileName
                 # @BRIEF Checks if the user has permission to send an email with the email address used.
                 ##
@@ -1879 +1879 @@
                 $forwarding_attachments = $params['forwarding_attachments'];
                 $local_attachments = $params['local_attachments'];
-                
+
                 //Test if must be saved in shared folder and change if necessary
                 if( $fromaddress[2] == 'y' ){
@@ -2074 +2074 @@
                                         $fileName = $file_description[2];
                                         if(!array_search(trim($fileName),$name_cid_files)) {
-                                                $mail->AddStringAttachment($fileContent, $fileName, $file_description[4], $this->get_file_type($file_description[2]));
+                                                $mail->AddStringAttachment($fileContent,html_entity_decode(rawurldecode($fileName)), $file_description[4], $this->get_file_type($file_description[2]));
                                 }
                         }

branches/2.2/expressoMail1_2/inc/gotodownload.php

@@ -12 +12 @@
         $msg_number = $_GET['msg_number'];
         $idx_file = $_GET['idx_file'];
-        $newfilename = urldecode($_GET['newfilename']);
+        $newfilename = html_entity_decode(rawurldecode($_GET['newfilename']));
         $msg_part = $_GET['msg_part'];
         $msg_folder = $_GET['msg_folder'];
@@ -24 +24 @@
                 $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
                 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];
-                $imap_port      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort'];          
+                $imap_port      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort'];
                 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes')
                 {
@@ -33 +33 @@
                         $imap_options = '/notls/novalidate-cert';
                 }
-                $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$msg_folder, $username, $password);          
+                $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$msg_folder, $username, $password);
                 $fileContent = imap_fetchbody($mbox_stream, $msg_number, $msg_part, FT_UID);
                 /*
                  *Removed by Bug #546
                  *include("class.imap_attachment.inc.php");
-                 *$imap_attachment = new imap_attachment();                     
+                 *$imap_attachment = new imap_attachment();
                  *$a = $imap_attachment->download_attachment($mbox_stream, $msg_number);
                  *$filename = $a[$idx_file]['name'];
@@ -54 +54 @@
 
         function downloadFile($strFileType, $strFileName, $newFileName, $fileContent, $encoding) {
-                //avoid stuck request 
-                session_write_close(); 
+                //avoid stuck request
+                session_write_close();
                 $ContentType = "application/octet-stream";
 
-                if ($strFileType == ".asf") 
+                if ($strFileType == ".asf")
                         $ContentType = "video/x-ms-asf";
                 if ($strFileType == ".avi")
@@ -82 +82 @@
                 if ($strFileType == ".htm" || $strFileType == "html")
                         $ContentType = "text/html";
-                if ($strFileType == ".xml") 
+                if ($strFileType == ".xml")
                         $ContentType = "text/xml";
-                if ($strFileType == ".xsl") 
+                if ($strFileType == ".xsl")
                         $ContentType = "text/xsl";
-                if ($strFileType == ".css") 
+                if ($strFileType == ".css")
                         $ContentType = "text/css";
-                if ($strFileType == ".php") 
+                if ($strFileType == ".php")
                         $ContentType = "text/php";
-                if ($strFileType == ".asp") 
+                if ($strFileType == ".asp")
                         $ContentType = "text/asp";
                 if ($strFileType == ".pdf")
@@ -161 +161 @@
                 header("Pragma: public");
                 header("Expires: 0"); // set expiration time
-                header ("Content-Disposition: attachment; filename=\"". addslashes($newFileName)."\"");         
+                header ("Content-Disposition: attachment; filename=\"". addslashes($newFileName)."\"");
                 if($fileContent) {
                         if($encoding == 'base64')