Changeset 5120 for branches/2.3/expressoMail1_2

Timestamp:

10/26/11 16:03:46 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2295 - Filtro bloqueia recebimento de todos emails

Location:

branches/2.3/expressoMail1_2

Files:

• inc/class.ScriptS.inc.php (modified) (4 diffs)
• js/filter.js (modified) (1 diff)

branches/2.3/expressoMail1_2/inc/class.ScriptS.inc.php

@@ -17 +17 @@
     var $continuebit;
     var $sizebit;
-    var $anyofbit;
+    var $allofbit;
     var $keepbit;
     var $regexbit;
@@ -42 +42 @@
         $this->continuebit  = 1;
         $this->sizebit      = 2;
-        $this->anyofbit     = 4;
+        $this->allofbit     = 4;
         $this->keepbit      = 8;
         $this->regexbit     = 128;
@@ -276 +276 @@
             $rule['continue']   = ($tmp1[8] & $this->continuebit);
             $rule['gthan']      = ($tmp1[8] & $this->sizebit);
-            $rule['anyof']      = ($tmp1[8] & $this->anyofbit);
+            $rule['allof']      = ($tmp1[8] & $this->allofbit);
             $rule['keep']       = ($tmp1[8] & $this->keepbit);
             $rule['regexp']     = ($tmp1[8] & $this->regexbit);
@@ -306 +306 @@
 
                 // Condições para montagem das regras;
-                $anyall = "allof";
-                if ($rule['anyof'])
-                    $anyall = "anyof";
+                $anyall = "anyof";
+                if ($rule['allof'])
+                {
+                    $anyall = "allof";
+                }
+                
                 if ($rule['regexp']) {
                     $regexused = 1;

branches/2.3/expressoMail1_2/js/filter.js

@@ -315 +315 @@
                                          "<tr><td colspan='2'><b>"+get_lang("Criteria")+":</b></td></tr><tr>"+
                                          "<td rowspan='4' width='20%'>"+get_lang('Find items')+":<br><select id='select_rules' name='select_rules'>"+
-                                         "<option value='1'>"+get_lang("If any criterion is met")+"</option><option value='0'>"+get_lang("If all criteria is met")+"</option>"+
+                                         "<option value='0'>"+get_lang("If any criterion is met")+"</option><option value='1'>"+get_lang("If all criteria is met")+"</option>"+
                                          "</select></td><td>"+get_lang('The field \"%1\" of the message it contains',get_lang('From'))+".: <input type='text' id='field1' name='field1' size='35' maxlength='200'></td>"+
                                                 "</tr><tr><td>"+get_lang('The field \"%1\" of the message it contains', get_lang('To'))+".: <input type='text' id='field2' name='field2' size='35' maxlength='200'></td>"+