Changeset 5708 for trunk/prototype/services/ImapServiceAdapter.php

Timestamp:

03/12/12 18:58:19 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Correcao de problemas em salvar followupflagged e adequacao de novos ids

File:

• trunk/prototype/services/ImapServiceAdapter.php (modified) (4 diffs)

trunk/prototype/services/ImapServiceAdapter.php

@@ -236 +236 @@
                                                 $this->mbox = $this->open_mbox($folder);
                                                 
-                                                foreach ($map['id'] as $followupflagged) {
-                                                        $messagesFlaggeds = imap_search($this->mbox, 'UNDELETED KEYWORD "$Followupflag'.$followupflagged.'"', SE_UID);
-                                                        
+                                                /**
+                                                 * Caso não tenha sido passado id no filtro
+                                                 */
+                                                if (!$map['id']) {
+                                                        $messagesFlaggeds = imap_search($this->mbox, 'UNDELETED KEYWORD "$Followupflagged"', SE_UID);
+
                                                         foreach ($messagesFlaggeds as $messageFlagged) {
                                                                 if (count($map['messageNumber']) > 0 && !in_array($messageFlagged, $map['messageNumber']))
@@ -244 +247 @@
                                                                         
                                                                 $result[] = array (
-                                                                        'id' => $folder . '/' . $messageFlagged . '#' . $followupflagged, 
                                                                         'folderName' => $folder,
                                                                         'messageNumber' => $messageFlagged
                                                                 );
+                                                        }
+                                                        
+                                                } else {
+                                                        foreach ($map['id'] as $followupflagged) {
+                                                                $messagesFlaggeds = imap_search($this->mbox, 'UNDELETED KEYWORD "$Followupflag'.$followupflagged.'"', SE_UID);
+                                                                
+                                                                foreach ($messagesFlaggeds as $messageFlagged) {
+                                                                        if (count($map['messageNumber']) > 0 && !in_array($messageFlagged, $map['messageNumber']))
+                                                                                continue;
+                                                                                
+                                                                        $result[] = array (
+                                                                                'id' => $folder . '/' . $messageFlagged . '#' . $followupflagged, 
+                                                                                'folderName' => $folder,
+                                                                                'messageNumber' => $messageFlagged
+                                                                        );
+                                                                }
                                                         }
                                                 }
@@ -309 +327 @@
                                  */
                                 list($messageId, $followupflaggedId) = explode('#', $URI['id']);
-                                $folderName = basename($messageId);
-                                $messageNumber = dirname($messageId);
+                                $folderName = dirname($messageId);
+                                $messageNumber = basename($messageId);
                                 
                                 $result = array();
@@ -358 +376 @@
                                         
                                         $this->mbox = $this->open_mbox($data['folderName']);
-                                        imap_setflag_full($this->mbox, $data['messageNumber'], '$Followupflagged $Followupflag' . $followupflaggedId, ST_UID);
-                                        
-                                        /**
-                                         * implementa a possibilidade de listar todas as mensagens sinalizadas através da busca
-                                         */
-                                        //imap_setflag_full($this->mbox, $data['messageNumber'], '$Followupflagged', ST_UID);
-
+                                        $s = imap_setflag_full($this->mbox, $data['messageNumber'], '$Followupflagged $Followupflag' . $followupflaggedId, ST_UID);
+                                                                                
                                         imap_close($this->mbox);
                                         $this->mbox = false;
 
-                                        return array ('id' => $data['id']);
+                                        return ($s) ? $data : array();
+
                                 }
                                 return array ();