Changeset 807 for trunk/lib/Utilities.inc.php

Timestamp:

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

Author:

anonymous

Message:

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

File:

• trunk/lib/Utilities.inc.php (modified) (4 diffs)

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 '';
 }