Changeset 3349

Timestamp:

08/17/2008 10:28:18 AM (4 months ago)

Author:

Geert

Message:

Follow-up to r3340. Passing regular expressions as an argument of chars[] remains hacky business but should work more solidly now.

Files:

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

trunk/system/libraries/Validation.php

@@ -271 +271 @@
                                         // Split the rule into the function and args
                                         $rule = $matches[1];
-                                        $args = preg_split('/(?<!\\\\),\s*/', $matches[2]);
-
-                                        // Replace escaped comma with comma
-                                        $args = str_replace('\,', ',', $args);
+                                        $args = $matches[2];
+
+                                        // Split the args, but don't touch them in case of a chars regex check
+                                        if ($rule !== 'chars')
+                                        {
+                                                $args = preg_split('/(?<!\\\\),\s*/', $args);
+                                                $args = str_replace('\\,', ',', $args);
+                                        }
                                 }
 
@@ -763 +767 @@
          *
          * @param   string  field value
-         * @param   array   allowed characters
+         * @param   string  allowed characters
          * @return  bool
          */
-        public function chars($value, array $chars)
-        {
-                return ! preg_match('![^'.implode('', $chars).']!', $value);
+        public function chars($value, $chars)
+        {
+                // Escape the preg_match delimeter
+                $chars = str_replace('~', '\\~', $chars);
+
+                // Prevent chars to escape the closing bracket of the character class
+                $chars = rtrim($chars, '\\');
+
+                // Return FALSE if any char outside of chars list is found
+                return ! preg_match('~[^'.$chars.']~u', $value);
         }