Changeset 1441

Timestamp:

12/07/2007 12:02:27 PM (10 months ago)

Author:

Shadowhand

Message:

Fixing some bugs with validation in Form_Input.

Files:

• trunk/modules/forge/libraries/Form_Input.php (modified) (3 diffs)

trunk/modules/forge/libraries/Form_Input.php

@@ -42 +42 @@
                 if ($method == 'rules')
                 {
-                        $this->add_rules(explode('|', $args[0]));
+                        // Set rules and action
+                        $rules  = $args[0];
+                        $action = substr($rules, 0, 1);
+
+                        if (in_array($action, array('-', '+', '=')))
+                        {
+                                // Remove the action from the rules
+                                $rules = substr($rules, 1);
+                        }
+                        else
+                        {
+                                // Default action is replace
+                                $action = '=';
+                        }
+
+                        $this->add_rules(explode('|', $rules), $action);
                 }
                 elseif ($method == 'name')
@@ -106 +121 @@
         }
 
-        protected function add_rules( array $rules)
-        {
+        protected function add_rules( array $rules, $action = '=')
+        {
+                if ($action === '=')
+                {
+                        // Just replace the rules
+                        $this->rules = $rules;
+                        return;
+                }
+
                 foreach($rules as $rule)
                 {
-                        if ( ! in_array($rule, $this->rules))
-                        {
-                                $this->rules[] = $rule;
+                        if ($action === '-')
+                        {
+                                if ($key = array_search($rule, $this->rules))
+                                {
+                                        // Remove the rule
+                                        unset($this->rules[$key]);
+                                }
+                        }
+                        else
+                        {
+                                if ( ! in_array($rule, $this->rules))
+                                {
+                                        if ($action == '+')
+                                        {
+                                                array_unshift($this->rules, $rule);
+                                        }
+                                        else
+                                        {
+                                                $this->rules[] = $rule;
+                                        }
+                                }
                         }
                 }
@@ -245 +285 @@
         protected function rule_length($min, $max = NULL)
         {
-                // Get the length
-                $length = strlen($this->value);
+                // Get the length, return if zero
+                if (($length = strlen($this->value)) === 0)
+                        return;
 
                 if ($max == NULL)