Changeset 4997 for trunk/expressoMail1_2

Timestamp:

08/26/11 13:56:07 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Corrigido problema ao mover mensagens para pastas acentuadas.4982

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/main.js (modified) (1 diff)

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

@@ -2794 +2794 @@
                 $folder = $params['folder'];
                 $mbox_stream = $this->open_mbox($folder);
-                $newmailbox = ($params['new_folder']);
-                $newmailbox = mb_convert_encoding($newmailbox, "UTF7-IMAP","ISO_8859-1");
-                $new_folder_name = $params['new_folder_name'];
-                $msgs_number = $params['msgs_number'];
+                $newmailbox = urldecode($params['new_folder']);
+                $newmailbox = mb_convert_encoding($newmailbox, "UTF7-IMAP","ISO_8859-1");
+                $new_folder_name = urldecode($params['new_folder_name']);
+                $msgs_number = $params['msgs_number'];
                 $return = array('msgs_number' => $msgs_number,
                                                 'folder' => $folder,

trunk/expressoMail1_2/js/main.js

@@ -808 +808 @@
         }
 
-        if (parseInt(msgs_number) > 0 || msgs_number.length > 0)
-                cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message, handler_move_msgs);
+        if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
+            var params = "&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+escape(new_folder)+"&new_folder_name="+escape(new_folder_name)+"&get_previous_msg="+preferences.delete_and_show_previous_message;
+            cExecute ("$this.imap_functions.move_messages",handler_move_msgs,params);
+        }
         else
                 write_msg(get_lang('No selected message.'));