Changeset 5443 in subversion

Timestamp:

Nov 18, 2011 2:49:02 AM (18 months ago)

Author:

alec

Message:

• Fixed setting test type to :is when none is specified

Location:

trunk/plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• managesieve.php (modified) (2 diffs)

trunk/plugins/managesieve/Changelog

@@ -1 @@
-* version 5.0-rc1 [2011-11-17]
+- Fixed setting test type to :is when none is specified
+
+* version 5.0-rc1 [2011-]
 -----------------------------------------------------------
 - Fixed sorting of scripts, scripts including aware of the sort order

trunk/plugins/managesieve/managesieve.php

@@ -1278 +1278 @@
 
         if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
-            $tout .= $select_op->show(($rule['not'] ? 'not' : '').$rule['type']);
+            $test   = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
             $target = $rule['arg2'];
         }
+        else if ($rule['test'] == 'body') {
+            $test   = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
+            $target = $rule['arg'];
+        }
         else if ($rule['test'] == 'size') {
-            $tout .= $select_op->show();
+            $test   = '';
+            $target = '';
             if (preg_match('/^([0-9]+)(K|M|G)?$/', $rule['arg'], $matches)) {
                 $sizetarget = $matches[1];
@@ -1293 +1298 @@
         }
         else {
-            $tout .= $select_op->show(($rule['not'] ? 'not' : '').$rule['test']);
-            $target = $rule['test'] == 'body' ? $rule['arg'] : '';
-        }
-
+            $test   = ($rule['not'] ? 'not' : '').$rule['test'];
+            $target =  '';
+        }
+
+        $tout .= $select_op->show($test);
         $tout .= '<input type="text" name="_rule_target[]" id="rule_target' .$id. '"
             value="' .Q($target). '" size="20" ' . $this->error_class($id, 'test', 'target', 'rule_target')