Changeset 807

Timestamp:

Feb 24, 2024 6:31:54 AM (2 months ago)

Author:

anonymous

Message:

Minor improvements. Add Validator::IPAddress() method.

Location:

trunk

Files:

• bin/module_maker/module.cli.php (modified) (1 diff)
• bin/module_maker/validation.cli.php (modified) (1 diff)
• lib/FormValidator.inc.php (modified) (1 diff)
• lib/Utilities.inc.php (modified) (4 diffs)
• lib/Validator.inc.php (modified) (3 diffs)

trunk/bin/module_maker/module.cli.php

@@ -207 +207 @@
         $default = $col[4];
 
-        if (mb_strpos($default, '0000') !== false || '0' == $default) {
+        if (is_null($default) || mb_strpos($default, '0000') !== false || '0' == $default) {
             $default = '';
         }

trunk/bin/module_maker/validation.cli.php

@@ -292 +292 @@
             }
             $negative_ok = $unsigned ? 'false' : 'true';
-            $o[] = "\$fv->isDecimal('$field', $max_dig, $max_dec, false, sprintf(_(\"%s must be a number with a maximum of %d integer digits and %d fractional digits, e.g., {EX}.\"), _(\"$title\"), ${max_dig}-${max_dec}, $max_dec), MSG_ERR, __FILE__, __LINE__);";
+            $o[] = "\$fv->isDecimal('$field', $max_dig, $max_dec, false, sprintf(_(\"%s must be a number with a maximum of %d integer digits and %d fractional digits, e.g., {EX}.\"), _(\"$title\"), {$max_dig}-{$max_dec}, $max_dec), MSG_ERR, __FILE__, __LINE__);";
             break;
 

trunk/lib/FormValidator.inc.php

@@ -694 +694 @@
     public function fileUploadSize($form_name, $msg='', $type=MSG_ERR, $file=null, $line=null)
     {
-        if (Validator::fileUploadSize($form_name, LOG_NOTICE, $file, $line)) {
+        if (Validator::fileUploadSize(LOG_NOTICE, $file, $line)) {
             return true;
         } else {

trunk/lib/Utilities.inc.php

@@ -25 +25 @@
  */
 
+require_once dirname(__FILE__) . '/App.inc.php';
 
 /**
@@ -186 +187 @@
     $app =& App::getInstance();
 
+    $indent = trim($indent, ' ') . ' ';
+
     $indent_str = str_repeat($indent, $depth);
     $output = '';
     if (is_array($var)) {
         foreach ($var as $k=>$v) {
-            $k = ucfirst(mb_strtolower(str_replace(array('_', '  '), ' ', $k)));
+            $k = ucfirst(mb_strtolower(str_replace(['_', '  '], ' ', $k)));
             if (is_array($v)) {
                 $output .= sprintf("\n%s%s:\n%s\n", $indent_str, $k, fancyDump($v, $indent, $depth+1));
@@ -200 +203 @@
         $output .= sprintf("%s%s\n", $indent_str, $var);
     }
-    return preg_replace(['/^[ \t]+$/' . $app->getParam('preg_u'), '/\n\n+/' . $app->getParam('preg_u'), '/^(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(\S )/m' . $app->getParam('preg_u')], ['', "\n", '$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8$9'], $output);
+
+    return preg_replace([
+        '/^[ \t]+$/' . $app->getParam('preg_u'),
+        '/\n\n+/' . $app->getParam('preg_u'),
+        sprintf('/^(?:%1$s( ))?(?:%1$s( ))?(?:%1$s( ))?(?:%1$s( ))?(?:%1$s( ))?(?:%1$s( ))?(?:%1$s( ))?(?:%1$s( ))?(%1$s )/m%2$s', preg_quote(trim($indent, ' '), '/'), $app->getParam('preg_u')),
+    ], [
+        '',
+        "\n",
+        '$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8$9'
+    ], $output);
 }
 
@@ -1516 +1528 @@
 
     $addr = canonicalIPAddr(trim($_SERVER['REMOTE_ADDR']));
-    return $dolookup && $addr ? gethostbyaddr($addr) : $addr;
+    if (false !== filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+        return $dolookup && '' != $addr ? gethostbyaddr($addr) : $addr;
+    }
+
+    return '';
 }
 

trunk/lib/Validator.inc.php

@@ -520 +520 @@
     *
     * @param  string $form_name The input data to validate.
-    * @param  const  $type  A LOG_* constant (see App->logMsg())
-    * @param  string $file  Filename to log (usually __FILE__)
-    * @param  int    $line  Line number to log (usually __LINE__)
-    * @return bool   True if no errors found, false otherwise.
+    * @param  const  $type      A LOG_* constant (see App->logMsg())
+    * @param  string $file      Filename to log (usually __FILE__)
+    * @param  int    $line      Line number to log (usually __LINE__)
+    * @return bool              True if no errors found, false otherwise.
     */
     static public function fileUploaded($form_name, $type=LOG_DEBUG, $file=null, $line=null)
@@ -555 +555 @@
     *
     * @access   public
-    * @param    string $form_name The input data to validate.
-    * @param  const  $type  A LOG_* constant (see App->logMsg())
-    * @param  string $file  Filename to log (usually __FILE__)
-    * @param  int    $line  Line number to log (usually __LINE__)
-    * @return   bool   True if no errors found, false otherwise.
+    * @param    const  $type  A LOG_* constant (see App->logMsg())
+    * @param    string $file  Filename to log (usually __FILE__)
+    * @param    int    $line  Line number to log (usually __LINE__)
+    * @return   bool          True if no errors found, false otherwise.
     * @author   Quinn Comendant <quinn@strangecode.com>
     * @version  1.0
     * @since    20 Aug 2014 14:44:23
     */
-    static public function fileUploadSize($form_name, $type=LOG_DEBUG, $file=null, $line=null)
+    static public function fileUploadSize($type=LOG_DEBUG, $file=null, $line=null)
     {
         $app =& App::getInstance();
@@ -575 +574 @@
     }
 
+    /*
+    *
+    *
+    * @access   public
+    * @param
+    * @return
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @since    09 Feb 2024 21:03:57
+    */
+    public static function IPAddress($val, $flags=null, $type=LOG_DEBUG, $file=null, $line=null)
+    {
+        $app =& App::getInstance();
+        if (is_string($val) && '' === trim($val)) {
+            // Don't be too bothered about empty strings.
+            return true;
+        }
+
+        if (!filter_var($val, FILTER_VALIDATE_IP, $flags)) {
+            $app->logMsg(sprintf('%s (line %s) failed: %s', __METHOD__, __LINE__, getDump($val)), $type, $file, $line);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
 } // THE END