Changeset 6243

Timestamp:

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

Author:

natan

Message:

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

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (4 diffs)
• prototype/services/ImapServiceAdapter.php (modified) (5 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"))
                                 {

trunk/prototype/services/ImapServiceAdapter.php

@@ -72 +72 @@
                         case 'folder':
                         {
-                                $result = $this->to_utf8($this->get_folders_list());
+                                $result = $this->getFolders();
 
                                 foreach ($result as $res) {
 
                                         $response[] = array(
-                                                        'id' => $res['folder_id'],
-                                                        'commonName' => $res['folder_name'],
-                                                        'parentFolder' => $res['folder_parent'],
+                                                        'id' => mb_convert_encoding( $res['folder_id'], 'UTF-8', 'UTF7-IMAP' ),
+                                                        'commonName' => mb_convert_encoding( $res['folder_name'], 'UTF-8' , 'UTF7-IMAP' ),
+                                                        'parentFolder' => mb_convert_encoding( $res['folder_parent'], 'UTF-8' , 'UTF7-IMAP' ),
                                                         'messageCount' => array('unseen' => isset($res['folder_unseen']) ? $res['folder_unseen'] : null, 'total' => null)
                                                 );
@@ -282 +282 @@
                                                 
                                                 foreach ($map['labelId'] as $label) {
-                                                        $messagesLabeleds = imap_search($this->mbox, 'UNDELETED KEYWORD "$Label'.$label.'"', SE_UID);
+                                                        $messagesLabeleds = imap_search($this->mbox, 'UNDELETED KEYWORD "$ExpressoLabel'.$label.'"', SE_UID);
                                                         
                                                         if(is_array($messagesLabeleds))
@@ -422 +422 @@
                                 if ($folderName && $messageNumber && $labelId) {
                                         $this->mbox = $this->open_mbox($folderName);
-                                        $messagesLabeleds = imap_search($this->mbox, 'UNDELETED KEYWORD "$Label'.$labelId.'"', SE_UID);
+                                        $messagesLabeleds = imap_search($this->mbox, 'UNDELETED KEYWORD "$ExpressoLabel'.$labelId.'"', SE_UID);
                                         
                                         if (in_array($messageNumber, $messagesLabeleds)) {
@@ -517 +517 @@
                                 if (isset($data['folderName']) && isset($data['messageNumber']) && isset($data['labelId'])) {
                                         $this->mbox = $this->open_mbox($data['folderName']);
-                                        imap_setflag_full($this->mbox, $data['messageNumber'], '$Label' . $data['labelId'], ST_UID);
+                                        imap_setflag_full($this->mbox, $data['messageNumber'], '$ExpressoLabel' . $data['labelId'], ST_UID);
 
                                         return array ('id' => $data['folderName'].'/'.$data['messageNumber'].'#'.$data['labelId']);
@@ -691 +691 @@
                                 if ($folderName && $messageNumber && $labelId) {
                                         $this->mbox = $this->open_mbox($folderName);
-                                        imap_clearflag_full($this->mbox, $messageNumber, '$Label' . $labelId, ST_UID);
+                                        imap_clearflag_full($this->mbox, $messageNumber, '$ExpressoLabel' . $labelId, ST_UID);
 
                                 }