Changeset 6304

Timestamp:

05/24/12 19:33:56 (12 years ago)

Author:

cristiano

Message:

Ticket #2799 - Problema no preview de mensagens (anexar mensagem)

File:

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

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

@@ -3445 +3445 @@
         {
                 $folder = $params['folder'];
-                $mbox_stream = $this->open_mbox($folder);
-                $newmailbox = ($params['new_folder']);
-                $newmailbox = mb_convert_encoding($newmailbox, "UTF7-IMAP","ISO-8859-1, UTF-8, UTF7-IMAP");
-                $new_folder_name = $params['new_folder_name'];
+                $newmailbox = mb_convert_encoding($params['new_folder'], "UTF7-IMAP", ( isset($params['decoded']) ? "" : "ISO-8859-1, " )."UTF-8, UTF7-IMAP" );
+                $new_folder_name = isset($params['decoded']) ? mb_convert_encoding($params['new_folder'], "ISO-8859-1", "UTF-8" ) : $params['new_folder_name'];
                 $msgs_number = $params['msgs_number'];
                 $return = array('msgs_number' => $msgs_number,
@@ -3592 +3590 @@
         function set_messages_flag($params)
         {               
-                $folder = mb_convert_encoding($params['folder'], "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP");
+                $folder = ( isset($params['decoded']) ) ? $params['folder'] : mb_convert_encoding($params['folder'], "UTF7-IMAP", "ISO-8859-1, UTF-8, UTF7-IMAP");
                 $msgs_to_set = $params['msgs_to_set'];
                 $flag = $params['flag'];