Changeset 534 for trunk/lib/Validator.inc.php

Timestamp:

Jul 27, 2015 7:56:08 AM (9 years ago)

Author:

anonymous

Message:

Improved module maker validation output. Allow disabling cache at run time for ACL. Added ACL getList() method. Improved ACL CLI listing. Fixed app boomerang array initialization. Now retaining identical boomerang URLs if the key is different. Added a maximum boomerang time. Added a way to disable cache per request through a query string. Added validator isDecimal() method. Added disableSelectOptions() HTML method. Added getGravatarURL() method. Change how navigation page array is managed. Updated navigation currentPage() method to test an array of URLs.

File:

• trunk/lib/Validator.inc.php (modified) (2 diffs)

trunk/lib/Validator.inc.php

@@ -120 +120 @@
      *
      * @param  string $val The input data to validate.
+     * @param  bool $negative_ok  If the value can be unsigned.
      * @return bool   true if value is a float
      */
@@ -126 +127 @@
         $pattern = $negative_ok ? '/^-?[[:digit:]]*(?:\.?[[:digit:]]+)$/' : '/^[[:digit:]]*(?:\.?[[:digit:]]+)$/';
         return '' == trim((string)$val) || (is_numeric($val) && preg_match($pattern, $val));
+    }
+
+    /**
+     * Check whether input is a Decimal or Fixed type. Check values to be stored in mysql decimal, numeric, num, or fixed types.
+     * Note: some integers and floats will also pass this test.
+     * https://dev.mysql.com/doc/refman/5.5/en/fixed-point-types.html
+     *
+     * @param  string $val The input data to validate.
+     * @param  bool $negative_ok  If the value can be unsigned.
+     * @param  int  $max    Total max number of digits (for mysql max is 65).
+     * @param  int  $dec    Total max number of digits after the decimal place (for mysql max is 30).
+     * @return bool   true if value is a float
+     */
+    static public function isDecimal($val, $negative_ok=false, $max=10, $dec=2)
+    {
+        if ('' == trim((string)$val)) {
+            return true;
+        }
+        if (!$negative_ok && is_numeric($val) && $val < 0) {
+            return false;
+        }
+        // Get the length of the part after any decimal point, or zero.
+        $num_parts = explode('.', $val);
+        $dec_count = sizeof($num_parts) <= 1 ? 0 : mb_strlen(end($num_parts));
+        // Must be numeric, total digits <= $max, dec digits <= $dec.
+        return is_numeric($val) && mb_strlen(str_replace(['-', '.'], '', $val)) <= $max && $dec_count <= $dec;
     }