Changeset 8080 for branches

Timestamp:

04/04/13 11:56:41 (11 years ago)

Author:

douglas

Message:

Ticket #3411 - Problema no download de anexos de mensagens em pastas com caracteres especiais no nome

Location:

branches/2.5/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)

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

@@ -1164 +1164 @@
 
                 $header_ = imap_fetchheader($this->mbox, $msg_number, FT_UID);
-                $return_get_body = $this->get_body_msg($msg_number, $msg_folder);
+                $return_get_body = $this->get_body_msg($msg_number, mb_convert_encoding( $msg_folder, "ISO-8859-1", "UTF-8" ));
                 $body = $return_get_body['body'];
                 if($return_get_body['body']=='isCripted'){
@@ -1200 +1200 @@
 
                 $return['msg_number'] = $msg_number.$plus_id;
-                $return['msg_folder'] = isset($params['decoded']) ? mb_convert_encoding( $msg_folder, "ISO-8859-1", "UTF-8" ) : $msg_folder;
+                $return['msg_folder'] = mb_convert_encoding( $msg_folder, "ISO-8859-1", "UTF-8" ); 
+                //isset($params['decoded']) ? mb_convert_encoding( $msg_folder, "ISO-8859-1", "UTF-8" ) : $msg_folder; 
 
                 

branches/2.5/expressoMail1_2/js/common_functions.js

@@ -289 +289 @@
         var params = '';
         if(msg_folder)
-                msg_folder = utf8_decoder(Base64.decode(msg_folder));
+                msg_folder = Base64.decode(msg_folder);
         if (div_attachment == null){
                 var div_attachment = document.createElement("DIV");

branches/2.5/expressoMail1_2/js/draw_api.js

@@ -3887 +3887 @@
                                                                 i++;
                                                         }else{
-                                                                var href = './inc/get_archive.php?msgFolder=' + utf8_decoder(fdr) + '&msgNumber=' + msg + '&indexPart=' + thumb.pid + '&image=true'; 
+                                                                var href = './inc/get_archive.php?msgFolder=' + fdr + '&msgNumber=' + msg + '&indexPart=' + thumb.pid + '&image=true'; 
                                                                 //var href = thumb.url; 
-                                                                var src  = 'inc/get_archive.php?msgFolder=' + utf8_decoder(fdr) + '&msgNumber=' + msg + '&indexPart=' + thumb.pid + '&image=thumbnail'; 
+                                                                var src  = 'inc/get_archive.php?msgFolder=' + fdr + '&msgNumber=' + msg + '&indexPart=' + thumb.pid + '&image=thumbnail'; 
                                 }
                                 var msgid= fdr+";;"+msg+";;"+i+";;"+thumb.pid+";;"+thumb.encoding;