Changeset 6285 for sandbox/2.4.1-1/prototype/modules/filters/interceptors/FilterMapping.php

Timestamp:

05/23/12 16:26:07 (12 years ago)

Author:

airton

Message:

Ticket #2764 - Implementacao de alerta ao usuario para criterio atendido nos filtros de mensagens

File:

• sandbox/2.4.1-1/prototype/modules/filters/interceptors/FilterMapping.php (modified) (5 diffs)

sandbox/2.4.1-1/prototype/modules/filters/interceptors/FilterMapping.php

@@ -217 +217 @@
                         $script_criteria .= ")"; 
 
-                        $script_action = " {\r\n ";
+                        //$script_action = " {\r\n ";
+                        /* Somente para controlar que o addFlag virá antes de qualquer ação. Modificar isso depois */
+                        $action_addFlag = '';
                         
                         if( is_array($action) )
@@ -223 +225 @@
                         {
                                 switch ($action[$k]['type']) {
+                                        case 'setflag':
+                                                $require_flag = true;
+                                                $action[$k]['parameter'] = "\\\\" . $action[$k]['parameter'];
+                                                break;
+                                        case 'addflag': 
+                                                $require_flag = true;
+                                                $action_addFlag = "addflag \"" . $action[$k]['parameter'] . "\";\r\n ";
+                                                break;
                                         case 'redirect':
                                                 break;
@@ -238 +248 @@
                                                 $vacation = true;
                                                 continue;
-                                        case 'setflag':
-                                                $require_flag = true;
-                                                $action[$k]['parameter'] = "\\\\" . $action[$k]['parameter'];
-                                                break;
                                         case 'discard':
                                                 break;
                                 }
-                                if ($vacation == false) $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";
+                                if ($vacation == false && $action[$k]['type'] != 'addflag') $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";
                         }
-                        $script_action .= "}";
                         
+                        /* ATENÇÃO: Colocar sempre o comando addflag antes de qualquer outro no caso de ações compostas no Sieve */
+                        if ($action_addFlag != '') $script_action = $action_addFlag . $script_action; 
+                        
+                        $script_action = "{\r\n " . $script_action . "}";
+                        $action_addFlag = '';
                         if($vacation == false)
                                 $script_rules .= $script_match . $script_criteria . $script_action . "\r\n";
@@ -256 +266 @@
                         $script_match = "";
                         $script_criteria = "";  
+                        $script_action = "";
                         $data['applyMessages'] = "";                                                    
                 }
@@ -281 +292 @@
 
                 $content = $script_begin . $script_header . $script_rules . "\r\n\r\n#PseudoScript#" . "\r\n#" . $json_data;
-                
+
                 return( $content );
         }