Changeset 8069 for trunk

Timestamp:

04/02/13 11:40:55 (11 years ago)

Author:

gustavo

Message:

Ticket #3411 - Problema ao fazer o download de anexo de mensagem que esteja numa pasta com caracteres especiais

Location:

trunk/expressoMail1_2

Files:

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

trunk/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;
 
                 

trunk/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");

trunk/expressoMail1_2/js/draw_api.js

@@ -2429 +2429 @@
 var msg_selected;
 function draw_message(info_msg, ID){
+    console.log(info_msg);
         // remove a flag $FilteredMessage da mensagem ao ser lida
         if(info_msg.Unseen == "U"){
@@ -3895 +3896 @@
                                                                 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;