Changeset 5989 for trunk/prototype/modules/mail

Timestamp:

04/20/12 18:14:09 (12 years ago)

Author:

adriano

Message:

Ticket #2633 - correcao nos interceptors de consistencia para a funcionalidade de sinalizadores

File:

• trunk/prototype/modules/mail/interceptors/Helpers.php (modified) (7 diffs)

trunk/prototype/modules/mail/interceptors/Helpers.php

@@ -133 +133 @@
 
                         if($imap_result) {
-                                $params['messageId'] = $imap_result['messageId'];
+                                $params['messageId'] = $imap_result[0]['messageId'];
                         }
                 }
 
                 $filter = array('=', 'messageId', $params['messageId']);
-                Controller::delete(array('concept' => 'followupflagged', 'service' => 'PostgreSQL'), null, $filter);
+                Controller::delete(array('concept' => 'followupflagged', 'service' => 'PostgreSQL'), null, array('filter' => $filter));
 
         }
@@ -159 +159 @@
                 if(isset($uri['id'])) {
                         Controller::deleteALL(array('concept' => 'followupflagged'), null , array('filter' => array('=' , 'followupflagId' , $uri['id'])));
-                
                 }
         }
@@ -165 +164 @@
         //followupflagged:PostgreSQL.before.delete
         public function doImapDelete( &$uri , &$params , &$criteria , $original ) {
-        
+
                 $imap_uri = $uri;
                 $imap_uri['service'] = 'Imap';
-                list($messageId, $uri['id']) = explode('#', $uri['id']);
-
-                $result = Controller::delete($imap_uri, $params, $imap_criteria);
-
-                if (!$result)
-                        return false;
+                
+                $result = Controller::delete($imap_uri, $params, $criteria);
+                                
+                return $result;
+
+        }
+        
+        //followupflagged:Imap.before.delete
+        public function getReferenceToImapDelete( &$uri , &$params , &$criteria , $original ) {
+        
+                if ($uri['id'] && !$criteria) {
+                        $db_uri = $uri;
+                        $db_uri['service'] = 'PostgreSQL';
+                        $flagged = Controller::read($db_uri, false, false);
+                        
+                        if ($flagged) {
+                                if (!$criteria) 
+                                        $criteria = array();
+                                $criteria['filter'] = array('=', 'messageId', $flagged['messageId']);
+                        } else {
+                                return false;
+                        }
+                }
         }
                 
@@ -190 +206 @@
         //followupflagged:PostgreSQL.after.read
         public function doImapRead( &$uri , &$result , &$criteria , $original ) {
-
+                /**
+                 * Se a busca for apenas no banco de dados, pula-se todas as verificações 
+                 * deste interceptor.
+                 */
+                if ($original['URI']['service'] == 'PostgreSQL') return $result;
+                
                 if ($result) {
-                        $imap_result = Controller::read(
-                                array('concept' => 'followupflagged', 'service' => 'Imap'), 
+                        $imap_uri = $uri;
+                        $imap_uri['service'] = 'Imap';
+                        $imap_result = Controller::find( 
+                                $imap_uri, 
                                 false, 
                                 array('filter' => array('=', 'messageId', $result['messageId']))
@@ -202 +225 @@
                  * Faz a consistência do banco com o imap
                  */
-                if (!$imap_result) {
-                        $r = Controller::deleteALL(array('concept' => 'followupflagged'), null , $criteria);
+                if (count($imap_result) < 1) {
+                        $r = Controller::delete($uri, null, $criteria);
                         return false;
+                } else {
+                        $imap_result = $imap_result[0];
                 }
                 
@@ -210 +235 @@
                  * Faz a consistência do banco com o imap
                  */
-                if ($imap_result['messageId'] !== $imap_result['messageId']) {
+                if ($imap_result['messageId'] !== $result['messageId']) {
                         $n = $imap_result;
                         $n['followupflagId']  = 1;
@@ -236 +261 @@
                 
                 if (self::in_arrayr('alarmDeadline', $original['criteria']) || self::in_arrayr('doneDeadline', $original['criteria'])) {
-                        if (empty($result)) return $reult;
+                        if (empty($result)) return $result;
                         
                         $idList = array();