Changeset 6392 for trunk/prototype/modules/filters/interceptors/FilterMapping.php

Timestamp:

06/02/12 16:40:08 (12 years ago)

Author:

airton

Message:

Ticket #2830 - Inconsistencia ao aplicar filtro nas mensagens da caixa de entrada

File:

• trunk/prototype/modules/filters/interceptors/FilterMapping.php (modified) (6 diffs)

trunk/prototype/modules/filters/interceptors/FilterMapping.php

@@ -58 +58 @@
 {
         var $service;
-        
+        var $msgs_apply = array();
         /**
         * Método que cria o ID da regra que está sendo criada.
@@ -282 +282 @@
                 {
                   $script_rules .= "vacation" . $vacation_action . "\r\n";
+                }
+
+                foreach ($rules as &$values) {                                          
+                        if($values['applyMessages'])
+                                $this->msgs_apply[] = $values['applyMessages'];
+                        $values['applyMessages'] = array();
                 }
 
@@ -501 +507 @@
                         $this->rules = array();
                 }
-                
                 return( $this->rules );
         }
@@ -522 +527 @@
         public function applySieveFilter( &$uri , &$result , &$criteria , $original  )
         {
+                $rule_apply = array(); 
+                        
+                $filter = Controller::read($uri);
+                $filter_ = $this->parseSieveScript($filter['content']);
                 
-                //if()                  
-                //{                                             
-                        $rule_apply = array(); 
+                foreach ($filter_ as $f_) {
+                        if($f_['id'] == $uri['id']) { 
+                                $rule_apply     = $f_;
+                        }
+                }
+                                
+                $actions = array();
+                $actions['type'] = $rule_apply['actions'][0]['type'];
+                $actions['parameter'] = $rule_apply['actions'][0]['parameter'];
+                /* Hardcoded */
+                $actions['keep'] = false;
+
+                //$messages = $rule_apply['applyMessages'];
+                $messages = $this->msgs_apply[0];
+                $this->msgs_apply = array();
                         
-                        $filter = Controller::read($uri);
-                        $filter_ = $this->parseSieveScript($filter['content']);
-                        
-                        foreach ($filter_ as $f_) {
-                                if($f_['id'] == $uri['id']) { 
-                                        $rule_apply     = $f_;
-                                }
-                        }
-                                        
-                        $actions = array();
-                        $actions['type']      = $rule_apply['actions'][0]['type'];
-                        $actions['parameter'] = $rule_apply['actions'][0]['parameter'];
-                        /* Hardcoded */
-                        $actions['keep']      = false;
-
-                        $messages_to_apply = array();                   
-
-                        $messages = $rule_apply['applyMessages'];
-                        /*        
-                        $proc = array();
-                        $proc['keep'] = false;
-                                 
-                        */
-                        $imap = Controller::service( 'Imap' );
-                        $imap->apliSieveFilter($messages, $actions); 
-                        return $result;
-                //}
+                $imap = Controller::service( 'Imap' );
+                $imap->apliSieveFilter($messages, $actions); 
+                return $result;
         }
 
@@ -596 +593 @@
         {
                 if( !$this->rules )
-                $this->rules = $this->getRules();
+                        $this->rules = $this->getRules();
 
             $uri['id'] = $params['id'] = isset($params['id']) ? $params['id'] : urlencode($params['name']);
@@ -633 +630 @@
                 $params['id'] = $uri['id'];
 
-                $update = false;
-                
                 $rules = array();