Changeset 1443 for trunk/modules/forge/libraries/Form_Input.php

Timestamp:

12/07/2007 12:50:49 PM (13 months ago)

Author:

Shadowhand

Message:

Changes to Form_Input:

• matches() updated to add a rule, rather than doing it's validate inline
  
• callback() added; callbacks are defined like this: function my_callback($input_object)
  
• validate() updated to handle matches and callbacks
  
• add_error($func, $value) added to add custom errors to inputs
  

Files:

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

trunk/modules/forge/libraries/Form_Input.php

@@ -17 +17 @@
         protected $protect = array();
 
-        // Validtion rules and callbacks
+        // Validation rules, matches, and callbacks
         protected $rules = array();
+        protected $matches = array();
         protected $callbacks = array();
 
@@ -81 +82 @@
         public function matches($input)
         {
-                if ($this->validate() AND $input->validate() AND $this->value != $input->value)
-                {
-                        $this->is_valid = FALSE;
-
-                        $this->errors['matches'] = array($input->name, $this->name);
-                }
-
-                return $this->is_valid;
+                if ( ! in_array($input, $this->matches))
+                {
+                        $this->matches[] = $input;
+                }
+
+                return $this;
+        }
+
+        public function callback($callback)
+        {
+                if ( ! in_array($callback, $this->callbacks))
+                {
+                        $this->callbacks[] = $callback;
+                }
+
+                return $this;
         }
 
@@ -99 +108 @@
                 else
                 {
-                        $this->label = ($val === TRUE) ? ucwords(str_replace('_', ' ', $this->name)) : $val;
+                        $this->label = ($val === TRUE) ? ucfirst($this->name) : $val;
                         return $this;
                 }
@@ -157 +166 @@
         }
 
+        public function add_error($key, $val)
+        {
+                if ( ! isset($this->errors[$key]))
+                {
+                        $this->errors[$key] = $val;
+                }
+
+                return $this;
+        }
+
         protected function error_message()
         {
@@ -165 +184 @@
                 foreach($this->errors as $func => $args)
                 {
-                        if ( ! is_array($args))
-                        {
-                                $args = array();
-                        }
-
-                        array_unshift($args, isset($this->data['label']) 
-                                ? strtolower($this->data['label']) 
-                                : $this->data['name']);
+                        if (is_string($args))
+                        {
+                                $error = $args;
+                        }
+                        else
+                        {
+                                // Force args to be an array
+                                $args = is_array($args) ? $args : array();
+
+                                array_unshift($args, isset($this->data['label'])
+                                        ? strtolower($this->data['label'])
+                                        : $this->data['name']);
+
+                                // Fetch an i18n error message
+                                $error = Kohana::lang('validation.'.$func, $args);
+                        }
 
                         // Make the error into HTML
-                        $message .= '<p class="error">'.Kohana::lang('validation.'.$func, $args).'</p>';
-                }
+                        $message .= '<p class="error">'.$error.'</p>';
+                }
+
                 return $message;
         }
@@ -205 +233 @@
 
                 // No rules to validate
-                if (count($this->rules) == 0)
+                if (count($this->rules) == 0 AND count($this->matches) == 0 AND count($this->callbacks) == 0)
                         return $this->is_valid = TRUE;
 
@@ -271 +299 @@
                 }
 
+                if ( ! empty($this->matches))
+                {
+                        foreach($this->matches as $input)
+                        {
+                                if ($this->value != $input->value)
+                                {
+                                        // Field does not match
+                                        $this->errors['matches'] = array($input->name);
+                                        break;
+                                }
+                        }
+                }
+
+                if ( ! empty($this->callbacks))
+                {
+                        foreach($this->callbacks as $callback)
+                        {
+                                call_user_func($callback, $this);
+
+                                // Stop when an error occurs
+                                if ( ! empty($this->errors))
+                                        break;
+                        }
+                }
+
                 // If there are errors, validation failed
                 return $this->is_valid = empty($this->errors);