Changeset 7489 for sandbox/webservice/api/rest/mail/MessagesResource.php

Timestamp:

11/01/12 10:35:51 (11 years ago)

Author:

alexandrecorreia

Message:

Ticket #2507 - Emparelhando os codigos do servidor de produção com o sandbox.

File:

• sandbox/webservice/api/rest/mail/MessagesResource.php (modified) (6 diffs)

sandbox/webservice/api/rest/mail/MessagesResource.php

@@ -10 +10 @@
                 if($this-> isLoggedIn()) 
                 {                                       
-                        $max_email_per_page = intval($this->getParam('resultsPerPage') ? $this->getParam('resultsPerPage') :
-                                        $this->getImap()->prefs['max_email_per_page']);
 
                         if($this->getParam('folderID') && $this->getParam('msgID') > 0) {
@@ -42 +40 @@
                                         $params = array(
                                                         'condition' => implode(",",$condition),                                                 
-                                                        'page'          => ($this->getParam('page') ? intval($this->getParam('page')) - 1 : 0),
+                                                        'page'          => (intval($this->getParam('page') ? $this->getParam('page') : "1"))-1,
                                                         'sort_type' => "SORTDATE"
                                                 );
 
                                         $this->getImap()->prefs['preview_msg_subject'] = "1";
+                                        error_log(serialize($params));
                                         $imap_msgs = $this->getImap()->search_msg($params);
 
-                                        if(!$imap_msgs){
-                                                return $this->getResponse();
-                                        }
                                         if($imap_msgs['num_msgs'] > 0) {
                                                 foreach($imap_msgs['data'] as $imap_msg) {
                                                         $msg = array();
                                                         $msg['msgID'] = $imap_msg['uid'];
-                                                        $msg['folderID'] = $imap_msg['boxname'];
+                                                        $msg['folderID'] = mb_convert_encoding($imap_msg['boxname'],'UTF-8','ISO-8859-1');
                                                         $msg['msgDate'] = $imap_msg['udate']." 00:00";
                                                         $msg['msgSubject'] = mb_convert_encoding($imap_msg['subject'],"UTF8", "ISO_8859-1");
@@ -76 +72 @@
                                 }
                                 else{
-                                        // TODO: Implementar a pesquisa de mensagens para versão 2.4
+                                        // TODO: Implementar a pesquisa de mensagens para verso 2.4
                                 }
                         }
                         else{
+                                $max_email_per_page = intval($this->getParam('resultsPerPage') ? $this->getParam('resultsPerPage') :
+                                        $this->getImap()->prefs['max_email_per_page']);
+        
                                 $current_page = intval($this->getParam('page') ? $this->getParam('page') : 1);
         
@@ -86 +85 @@
         
                                 $this->getImap()->prefs['preview_msg_subject'] = "1";
-        
-        
+
                                 $imap_msgs = $this->getImap()-> get_range_msgs2(
                                         array(  "folder"                        => $this->getParam('folderID'),
@@ -99 +97 @@
                                         return $this->getResponse();
                                 }
-        
+
+                                $folderID = mb_convert_encoding($this->getParam('folderID'), 'UTF-8','ISO-8859-1');
+
                                 foreach($imap_msgs as $i => $imap_msg) {
                                         if(!is_int($i)) {
                                                 continue;
                                         }
+                                        
                                         $msg = array();
                                         $msg['msgID'] = $imap_msg['msg_number'];
-                                        $msg['folderID'] =  $imap_msgs['folder'];
+                                        $msg['folderID'] = $folderID;
+
                                         $msg['msgDate'] = gmdate('d/m/Y H:i', $imap_msg['timestamp']);
                                         $msg['msgFrom']['fullName'] = mb_convert_encoding($imap_msg['from']['name'],"UTF8", "ISO_8859-1");
@@ -153 +155 @@
                         }
                 }
-                $num_msgs  = 0;
-                $num_pages = 1;         
-                $num_msgs = intval($imap_msgs['num_msgs']);
-                if($num_msgs > $max_email_per_page) {
-                        $num_pages = $num_msgs / $max_email_per_page;
-                        if($num_pages > intval($num_pages))
-                                $num_pages = intval($num_pages) + 1;
-                }
-                
                 $result = array (
                                 'messages'        => $all_msgs,
-                                'numMessages' => $num_msgs,
-                                'numPages'        => $num_pages,
                                 'timeZone'        => $imap_msgs['offsetToGMT'] ? $imap_msgs['offsetToGMT'] : "",
                                 'totalUnseen' => $imap_msgs['tot_unseen'] ? $imap_msgs['tot_unseen'] : ""