Changeset 6287 for trunk/expressoMail1_2/inc

Timestamp:

05/23/12 17:58:10 (12 years ago)

Author:

natan

Message:

Ticket #2779 - Mensagens em pastas acentuadas não são movidas para outras pastas

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

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

@@ -3446 +3446 @@
         {
                 $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,