Changeset 2422 for trunk/system/libraries/Validation.php

Timestamp:

04/04/2008 02:28:14 PM (8 months ago)

Author:

Shadowhand

Message:

Updated Validation:

• Validation::message() in favor of Validation::errors()
  
• Updated i18n file
  

Files:

• trunk/system/libraries/Validation.php (modified) (2 diffs)

trunk/system/libraries/Validation.php

@@ -73 +73 @@
 
         /**
-         * Set the format of message strings.
-         *
-         * @chainable
-         * @param   string   new message format
-         * @return  object
-         */
-        public function message_format($str)
-        {
-                if (strpos($str, '{message}') === FALSE)
-                        throw new Kohana_Exception('validation.error_format');
-
-                // Set the new message format
-                $this->message_format = $str;
-
-                return $this;
-        }
-
-        /**
-         * Sets or returns the message for an input.
-         *
-         * @chainable
-         * @param   string   input key
-         * @param   string   message to set
-         * @return  string|object
-         */
-        public function message($input = NULL, $message = NULL)
-        {
-                if ($message === NULL)
-                {
-                        if ($input === NULL)
-                        {
-                                $messages = array();
-                                foreach (array_keys($this->messages) as $input)
-                                {
-                                        $messages[] = $this->message($input);
-                                }
-
-                                return implode("\n", $messages);
-                        }
-
-                        // Return nothing if no message exists
-                        if (empty($this->messages[$input]))
-                                return '';
-
-                        // Return the HTML message string
-                        return str_replace('{message}', $this->messages[$input], $this->message_format);
-                }
-                else
-                {
-                        $this->messages[$input] = $message;
-                }
-
-                return $this;
-        }
-
-        /**
          * Add a pre-filter to one or more inputs.
          *
@@ -482 +426 @@
 
         /**
+         * Sets or returns the message for an input.
+         *
+         * @chainable
+         * @param   string   input key
+         * @param   string   message to set
+         * @return  string|object
+         */
+        public function message($input = NULL, $message = NULL)
+        {
+                if ($message === NULL)
+                {
+                        if ($input === NULL)
+                        {
+                                $messages = array();
+                                foreach (array_keys($this->messages) as $input)
+                                {
+                                        $messages[] = $this->message($input);
+                                }
+
+                                return implode("\n", $messages);
+                        }
+
+                        // Return nothing if no message exists
+                        if (empty($this->messages[$input]))
+                                return '';
+
+                        // Return the HTML message string
+                        return str_replace('{message}', $this->messages[$input], $this->message_format);
+                }
+                else
+                {
+                        $this->messages[$input] = $message;
+                }
+
+                return $this;
+        }
+
+        /**
          * Return the errors array.
          *
-         * @return array
-         */
-        public function errors()
-        {
-                return $this->errors;
-        }
-
-        /**
-         * Provides a generic interface to load the errors. Each field can have a
-         * specific message, such as username.required, and a default message, such
-         * as username.default.
-         *
-         * @param   string   language file to load errors from
-         * @return  void
-         */
-        public function load_errors($file = 'forms')
-        {
-                foreach ($this->errors as $input => $error)
-                {
-                        // Key for this input error
-                        $key = "$file.$input.$error";
-
-                        if (($str = Kohana::lang($key)) === $key)
-                        {
-                                // Get the default error message
-                                $str = Kohana::lang("$file.$input.default");
-                        }
-
-                        // Add the message
-                        $this->message($input, $str);
+         * @param   boolean  load errors from the a lang file
+         * @return  array
+         */
+        public function errors($file = NULL)
+        {
+                if ($file === NULL)
+                {
+                        return $this->errors;
+                }
+                else
+                {
+                        $errors = array();
+                        foreach ($this->errors as $input => $error)
+                        {
+                                // Key for this input error
+                                $key = "$file.$input.$error";
+
+                                if (($str = Kohana::lang($key)) === $key)
+                                {
+                                        // Get the default error message
+                                        $errors[$input] = Kohana::lang("$file.$input.default");
+                                }
+                        }
+                        
+                        return $errors;
                 }
         }