Changeset 5747

Timestamp:

03/19/12 10:08:11 (12 years ago)

Author:

airton

Message:

Ticket #1782 - Especificar DFD0060 - Correcao da verificacao do array de regras

File:

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

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

@@ -84 +84 @@
                 foreach( $rules as $name => $data )
                 {
-                        /* Usado na opção Bloquear usuário do ExpressoMail */
-                        if($data['block']) {
-                                ($i >0) ? $script_match = 'elsif anyof' : $script_match = 'if anyof';
-                                $script_match = $script_match . "(address :is \"from\" [\"" .$data['name'] . "\"]) {\r\n";  
-                                $script_match .= "fileinto \"INBOX/Spam\"; \r\n}\r\n";
-                                $script_rules .= $script_match;
-                                $script_match = "";
-                                $script_criteria = "";
-                                $require_fileinto = true;
-                                $i++;
-                                continue;
+                        
+                        if(array_key_exists("block", $data)) {
+                                /* Usado na opção Bloquear usuário do ExpressoMail */
+                                if($data['block']) {
+                                        ($i >0) ? $script_match = 'elsif anyof' : $script_match = 'if anyof';
+                                        $script_match = $script_match . "(address :is \"from\" [\"" .$data['name'] . "\"]) {\r\n";  
+                                        $script_match .= "fileinto \"INBOX/Spam\"; \r\n}\r\n";
+                                        $script_rules .= $script_match;
+                                        $script_match = "";
+                                        $script_criteria = "";
+                                        $require_fileinto = true;
+                                        $i++;
+                                        continue;
+                                }
                         }
-                        
-                        if( $data['enabled'] == 'false' )
-                                continue;
+                        //if( $data['enabled'] == 'false' )
+                                //continue;
 
                         $vacation = false;
@@ -194 +196 @@
                         $script_action = " {\r\n ";
                         
-                        if( is_array($actions) )
+                        if( is_array($action) )
                         foreach ($action as $k=> $value);
                         {
@@ -257 +259 @@
                 $content = $script_begin . $script_header . $script_rules . "\r\n\r\n#PseudoScript#" . "\r\n#" . $json_data;
                 //$content = ""; 
+
                 return( $content );
         }
@@ -415 +418 @@
         public function applySieveFilter( &$uri , &$result , &$criteria , $original  )
         {
+                /*
                 $result['id'] = $uri['id'];
                 $rule_apply = array(); 
@@ -436 +440 @@
                 $proc = array();
                 $proc['keep'] = false;
-                      
-                
-                $imap = Controller::service( 'Imap' );
+                */      
+                
+                //$imap = Controller::service( 'Imap' );
                 //$imap->apliSieveFilter($original['properties']['applyMessages'] , $proc ); 
-                $imap->apliSieveFilter($messages , $actions ); 
-                return $result;
+                //$imap->apliSieveFilter($messages , $actions ); 
+                //return $result;
         }
 
@@ -564 +568 @@
 
                 foreach( $script as $i => $rule )
+                        if(is_array ($rule['name']) && is_array($original['id']))
                         if( $rule['name'] === $original['id'] )
                                 return( $params = $rule );