Changeset 6243 for trunk/prototype/services/ImapServiceAdapter.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/prototype/services/ImapServiceAdapter.php (modified) (5 diffs)

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);
 
                                 }