Changeset 6287 for trunk

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

Location:

trunk/expressoMail1_2

Files:

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

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,

trunk/expressoMail1_2/js/main.js

@@ -687 +687 @@
         string_msgs_in_main = tmp.substring(0,(tmp.length-1));
         if(!expresso_offline)
-                cExecute ("$this.imap_functions.refresh&folder="+current_folder+"&msgs_existent="+string_msgs_in_main+"&msg_range_begin="+msg_range_begin+"&msg_range_end="+msg_range_end+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_refresh);
+                $.ajax({
+                          url: 'controller.php?' + $.param( {action: '$this.imap_functions.refresh',
+                                                              folder: current_folder,
+                                                              msgs_existent: string_msgs_in_main,
+                                                              msg_range_begin: msg_range_begin,
+                                                              msg_range_end: msg_range_end,
+                                                              sort_box_type: sort_box_type,
+                                                              search_box_type: search_box_type,
+                                                              sort_box_reverse: sort_box_reverse } ),
+                          success: function( data ){
+                              data = connector.unserialize( data );
+                              
+                              if( data )
+                                  handler_refresh( data );
+                          }
+
+                });
 }
 
@@ -1140 +1156 @@
         refresh();
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
-                if(!not_opem_previus){
-                        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);
-                }else{
-                        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="+false, handler_move_msgs);
-        }
+              $.ajax({
+                                url: 'controller.php?' + $.param( {action: '$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: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ),
+                                                                    decoded: true } ),
+
+                                success: function( data ){
+                                    data = connector.unserialize( data );
+                                    
+                                    if( data )
+                                        handler_move_msgs( data );
+                                }
+
+                      });
         }else
                 write_msg(get_lang('No selected message.'));