Changeset 2592

Timestamp:

04/28/2008 03:01:02 PM (5 months ago)

Author:

Shadowhand

Message:

Added valid::decimal, updated comments.

Files:

• trunk/system/helpers/valid.php (modified) (2 diffs)

trunk/system/helpers/valid.php

@@ -241 +241 @@
 
         /**
-         * Checks whether a string is a valid text.
+         * Checks whether a string is a valid text. Letters, numbers, whitespace,
+         * dashes, periods, and underscores are allowed.
          *
          * @param   string   $str
@@ -251 +252 @@
         }
 
+        /**
+         * Checks if a string is a proper decimal format. The format array can be
+         * used to specify a decimal length, or a number and decimal length, eg:
+         * array(2) would force the number to have 2 decimal places, array(4,2)
+         * would force the number to have 4 digits and 2 decimal places.
+         *
+         * @param   string   input string
+         * @param   array    decimal format: y or x,y
+         * @return  boolean
+         */
+        public function decimal($str, $format = NULL)
+        {
+                // Create the pattern
+                $pattern = '/^[0-9]%s\.[0-9]%s$/';
+
+                if ( ! empty($format))
+                {
+                        if (count($format) > 1)
+                        {
+                                // Use the format for number and decimal length
+                                $pattern = sprintf($pattern, '{'.$format[0].'}', '{'.$format[1].'}');
+                        }
+                        elseif (count($format) > 0)
+                        {
+                                // Use the format as decimal length
+                                $pattern = sprintf($pattern, '+', '{'.$format[0].'}');
+                        }
+                }
+                else
+                {
+                        // No format
+                        $pattern = sprintf($pattern, '+', '+');
+                }
+
+                return (bool) preg_match($pattern, (string) $str);
+        }
+
 } // End valid