Changeset 6243 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

05/19/12 21:39:07 (12 years ago)

Author:

natan

Message:

Ticket #2752 - Criando pastas acentuadas no Expresso Mail - Corrigido

File:

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

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

@@ -2402 +2402 @@
         function get_folders_list($params = null)
         {
-
+            $return = $this->getFolders( $params );
+        
+            foreach ($return as $i => &$vv)
+            {
+                $vv['folder_id'] = mb_convert_encoding($vv['folder_id'],'ISO-8859-1','UTF7-IMAP');//DECODIFICA ID DAS PASTAS COM ACENTOS
+                $vv['folder_name'] = mb_convert_encoding($vv['folder_name'],'ISO-8859-1','UTF7-IMAP');//DECODIFICA NOME DAS PASTAS COM ACENTOS
+                $vv['folder_parent'] = mb_convert_encoding($vv['folder_parent'],'ISO-8859-1','UTF7-IMAP');//DECODIFICA NOME DAS PASTAS COM ACENTOS
+            }
+
+            return ( $return );        
+        }
+        
+        function getFolders($params = null)
+        {
                 ///Define Variaveis
                 $prefixShared = 'user'; //Prefixo das pastas compartilhadas
@@ -2452 +2465 @@
                         {
                                 $append = array();                              
-                                $append['folder_id'] = mb_convert_encoding($vv['id'],'ISO-8859-1','UTF7-IMAP');//DECODIFICA ID DAS PASTAS COM ACENTOS
+                                $append['folder_id'] = $vv['id'];
                                 $append['folder_name'] = (($uid2cn && isset($vv['user'])) && ($cn = $this->ldap->uid2cn($vv['user']))) ? $cn : $vv['name'];
-                                $append['folder_name'] = mb_convert_encoding($append['folder_name'],'ISO-8859-1','UTF7-IMAP');//DECODIFICA NOME DAS PASTAS COM ACENTOS
                                 $status = imap_status($mboxStream, $vv['stream'], SA_UNSEEN); //Resgata Numero de mensagens não lidas
                                 $append['folder_unseen'] = isset($status->unseen) ? $status->unseen : 0 ;
                                 $append['folder_hasChildren'] = (($vv['attributes'] == 32) && ($vv['name'] != 'INBOX')) ? 1 : 0;
-                                $append['folder_parent'] = mb_convert_encoding($vv['parent'],'ISO-8859-1','UTF7-IMAP');
+                                $append['folder_parent'] = $vv['parent'];
                                 $return[] = $append;
                         }
@@ -2482 +2494 @@
                         $namebox =  mb_convert_encoding($namebox, "UTF7-IMAP", "UTF-8");
                         $result = "Ok";
+                        
                         if(!imap_createmailbox($mbox_stream,"{".$imap_server."}".$namebox))
                         {
@@ -2492 +2505 @@
                                 $namebox =  mb_convert_encoding($child, "UTF7-IMAP", "UTF-8");
                                 $result = "Ok";
+
                                 if(!imap_createmailbox($mbox_stream,"{".$imap_server."}$namebox"))
                                 {