Changeset 5206 for trunk

Timestamp:

11/24/11 17:55:06 (12 years ago)

Author:

acoutinho

Message:

Ticket #2344 - Problema ao anexar arquivo que possua em sua nomeclatura caracteres especiais

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (6 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3780 +3780 @@
         function save_msg($params)
         {
+        
+                ob_start();
+        print_r( $params);
+        
+        $output = ob_get_clean();
+        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+        
                 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
                 $mailService = ServiceLocator::getService('mail');
@@ -3806 +3813 @@
                 }
 
-                $folder = mb_convert_encoding($params['folder'], "UTF7-IMAP","ISO_8859-1");
+                $folder = mb_convert_encoding($params['folder'], "UTF7-IMAP","ISO-8859-1, UTF-8");
                 $folder = @eregi_replace("INBOX[/.]", "INBOX".$this->imap_delimiter, $folder);
 
@@ -3889 +3896 @@
 
                 //Build Uploading Attachments!!!
-                $sizeof_attachments = count($attachments);
+                $sizeof_attachments = count($attachments);      
                 if ($sizeof_attachments)
                         foreach ($attachments as $numb => $attach)
@@ -3924 +3931 @@
                                 if (array_key_exists("name", $_attachment))
                                 {
-                                        $returnFiles[$ii]['name'] = base64_encode($_attachment['name']);
+                                        $returnFiles[$ii]['name'] = base64_encode(mb_convert_encoding( $_attachment['name'], 'UTF-8', 'UTF-8, ISO-8859-1') );
                                         $returnFiles[$ii]['size'] = $_attachment['size'];
                                         $ii++;
@@ -3930 +3937 @@
                                 else if($_attachment[2])
                         {
-                                        $returnFiles[$ii]['name'] = base64_encode($_attachment[2]); 
+                                        $returnFiles[$ii]['name'] = base64_encode(mb_convert_encoding( $_attachment[2], 'UTF-8', 'UTF-8, ISO-8859-1')); 
                                         $returnFiles[$ii]['size'] = $_attachment[5];         
                                         $ii++;
@@ -3939 +3946 @@
                 $return["subject"] = $params['input_subject'];
                 if (!$return['append']) $return['append'] = imap_last_error();
+                
+                
+                ob_start();
+        print_r( $returnFiles);
+        print_r( $return);
+        
+        
+        
+        $output = ob_get_clean();
+        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+                
                 return $return;
         }