Changeset 6254

Timestamp:

05/21/12 16:02:11 (12 years ago)

Author:

natan

Message:

Ticket #2777 - Problemas ao mover/abrir pastas acentuadas no expressoMail

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)
• expressoMail1_2/js/messages_controller.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (2 diffs)

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

@@ -162 +162 @@
         }
 
+        function get_range_msgs3($params){
+
+                $return = $this->get_range_msgs2($params);
+
+                $return['folder'] = mb_convert_encoding( $return['folder'], 'ISO_8859-1', 'UTF-8' );
+
+                return $return;
+        }
+
         function get_range_msgs2($params)
         {       
@@ -183 +192 @@
 
             if(!$search_box_type || $search_box_type == 'UNSEEN' || $search_box_type == 'SEEN') {
-                    $msgs_info = imap_status($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".mb_convert_encoding( $folder, 'UTF7-IMAP', 'ISO_8859-1' ) ,SA_ALL);
+                    $msgs_info = imap_status($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".mb_convert_encoding( $folder, 'UTF7-IMAP', 'UTF-8, ISO_8859-1' ) ,SA_ALL);
 
                     $return['tot_unseen'] = ($search_box_type == 'SEEN') ? 0 : $msgs_info->unseen;

trunk/expressoMail1_2/js/messages_controller.js

@@ -25 +25 @@
                         draw_tree_local_folders();
                 }else {
-                        cExecute ("$this.imap_functions.get_range_msgs2&folder="+folder+"&msg_range_begin="+msg_range_begin+"&msg_range_end="+emails_per_page+"&sort_box_type="+sort_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", call_back);
+                        $.ajax({
+                                url: "controller.php?" + $.param( {action: "$this.imap_functions.get_range_msgs3", 
+                                                                    folder: folder, 
+                                                                    msg_range_begin: msg_range_begin, 
+                                                                    msg_range_end: emails_per_page, 
+                                                                    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 )
+                                        call_back( data );
+                              }
+                          
+                        });
                 }
         }

trunk/prototype/modules/mail/js/foldertree.js

@@ -151 +151 @@
                 selected = target.attr('id');
                 change_folder(target.attr('id'), child.attr('title'));  
-                var draw_shared_quota = function(data){
-                        build_quota(data);
-                };
-                cExecute ("$this.imap_functions.get_folders_list&folder="+target.attr('id'), draw_shared_quota);
+
+                $.ajax({
+                          url : "controller.php?"+ $.param( { action: "$this.imap_functions.get_folders_list", folder: target.attr('id') } ),
+                          success : function(data){
+                                  data = connector.unserialize(data);
+
+                                  if(data)
+                                    build_quota(data);
+                          }
+                });
+
         }).filter('.followup-messages').click(function(event, ui){
                 search_emails("UNDELETED KEYWORD \"$Followupflagged\"");
@@ -270 +277 @@
                                 
                                 $.ajax({
-                                        url : "controller.php?action=$this.imap_functions.move_folder&folder_to_move="+folder_to_move+"&folder_to="+folder_to,
+                                        url : "controller.php?"+ $.param( { action: "$this.imap_functions.move_folder", folder_to_move: folder_to_move, folder_to: folder_to } ),
                                         success : function(data){
                                                 data = connector.unserialize(data);