Changeset 5609

Timestamp:

03/02/12 12:42:04 (12 years ago)

Author:

adriano

Message:

Ticket #2486 - impedimento de criacao de mais de um sinalizador para cada mensagem

Location:

trunk/prototype

Files:

• config/followupflagged.ini (modified) (1 diff)
• modules/mail/interceptors/Helpers.php (modified) (4 diffs)

trunk/prototype/config/followupflagged.ini

@@ -3 +3 @@
 
 
-[after.find]
-deepnessFollowupflaggeds = modules/mail/interceptors/Helpers.php
-
-[PostgreSQL.before.create]
-;letFollowupflaggedKeepUnique = modules/mail/interceptors/Helpers.php
-
-[PostgreSQL.after.create]
-doImapCreate = modules/mail/interceptors/Helpers.php
+[PostgreSQL.before.find]
+clearFilterAtFind = modules/mail/interceptors/Helpers.php
 
 [PostgreSQL.after.find]
 doImapFind = modules/mail/interceptors/Helpers.php
 
-[PostgreSQL.before.find]
-clearFilterAtFind = modules/mail/interceptors/Helpers.php
+[after.find]
+deepnessFollowupflaggeds = modules/mail/interceptors/Helpers.php
+
+[Imap.before.create]
+letFollowupflaggedKeepUnique = modules/mail/interceptors/Helpers.php
+
+[PostgreSQL.after.create]
+doImapCreate = modules/mail/interceptors/Helpers.php
 
 [PostgreSQL.before.read]

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

@@ -70 +70 @@
         
         public static function in_arrayr($needle, $haystack) {
+                //if(!is_array($haystack)) return false;
+                
                 foreach ($haystack as $v) {
                                 if ($needle == $v) return true;
@@ -82 +84 @@
  */ 
 
+        //followupflag:before.find
+        public function addDefaultElementsFilter (&$uri , &$params , &$criteria , $original ){
+                if (!self::in_arrayr('id', $criteria['filter'])) {
+                        $defaultsFilter = array( 'IN' , 'id' , array('1','2','3','4','5','6') );
+                        
+                        if (isset($criteria['filter']) && $criteria['filter']!=NULL && count($criteria['filter']) != 0)
+                                $criteria['filter'] = array( 'OR', $criteria['filter'], $defaultsFilter );
+                        else
+                                $criteria['filter'] =  $defaultsFilter;
+                }
+        }  
+        
         //followupflagged:after.find
         public function deepnessFollowupflaggeds( &$uri , &$result , &$criteria , $original ){                
@@ -111 +125 @@
         //followupflagged:PostgreSQL.before.find
         public function clearFilterAtFind( &$uri , &$params , &$criteria , $original ) {
-
+        
                 if ($criteria['filter'] && 
                                 (self::in_arrayr('messageNumber', $criteria['filter']) || self::in_arrayr('folderName', $criteria['filter'])) ) {
@@ -162 +176 @@
         }
 
-        //followupflagged:PostgreSQL.before.create
+        //followupflagged:before.create
         public function letFollowupflaggedKeepUnique (&$uri , &$params , &$criteria , $original ){
         
                 if (isset($params['folderName']) && isset($params['messageNumber'])) {
-                        $filter = array ( 'AND', array('=', 'folderName', $params['folderName']), array('=', 'messageNumber', $params['messageNumber']) );
-                        Controller::delete( array( 'concept' => 'followupflagged' ), false, array( 'filter' => $filter));
+                        $filter = array ('AND', array('=', 'folderName', $params['folderName']), array('=', 'messageNumber', $params['messageNumber']));
+                        $toClearURI = array('concept' => 'followupflagged', 'service' => 'Imap');
+
+                        //Obtém do banco um possível sinalizador existente
+                        $imap_result = Controller::find($toClearURI, false, array('filter' => $filter));
+
+                        //Se existe um sinalizador nesta mensagem, deleta-o
+                        foreach ($imap_result as $r) {
+                                //deleta no Imap
+                                $toClearURI['id'] = $r['id'];
+                                Controller::delete($toClearURI, false, false);
+                                
+                                //deleta no PostgreSQL
+                                list($messageId, $toClearURI['id']) = explode('#', $r['id']);
+                                $toClearURI['service'] = 'PostgreSQL';
+                                Controller::delete($toClearURI, false, false);
+                        }
                 }
         }