Changeset 1536

Timestamp:

12/14/07 16:35:13 (9 months ago)

Author:

armen

Message:

You can use php functions like trim, sha1, md5, strtoupper, etc as a rule, jus add an = at the begining of the rule name. Fixed #272
*BC Break* : you can't use trim, sha1 and md5 rules anymore you have to add an = as prefix

Location:

trunk

Files:

• application/controllers/examples.php (modified) (1 diff)
• system/libraries/Validation.php (modified) (1 diff)

trunk/application/controllers/examples.php

@@ -142 +142 @@
                         // Format:
                         // key          friendly name,  validation rules
-                        'user' => array('username',    'trim|required[1,12]|regex[[0-9]+]'),
-                        'pass' => array('password',    'required|sha1'),
+                        'user' => array('username',    '=trim|required[1,12]|regex[[0-9]+]'),
+                        'pass' => array('password',    'required|=sha1'),
                         'reme' => array('remember me', 'required')
                 ));

trunk/system/libraries/Validation.php

@@ -342 +342 @@
                 else
                 {
-                        if ($rule === 'trim' OR $rule === 'sha1' OR $rule === 'md5')
-                        {
-                                /**
-                                 * @todo safe_form_data
-                                 */
+                        if (strpos($rule, '=') === 0)
+                        {
+                                $rule                           = substr($rule, 1);
                                 $this->data[$field] = $rule($data);
                                 return;