Changeset 765

Timestamp:

Mar 12, 2022 11:19:21 PM (2 years ago)

Author:

anonymous

Message:

Improve getDump()

File:

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

trunk/lib/Utilities.inc.php

@@ -121 +121 @@
 * @author   Quinn Comendant <quinn@strangecode.com>
 */
-function getDump($var, $serialize=false)
-{
-    $app =& App::getInstance();
-
-    ob_start();
-    print_r($var);
-    $d = ob_get_contents();
-    ob_end_clean();
+function getDump($var, $serialize=false, $dump_method=SC_DUMP_PRINT_R)
+{
+    $app =& App::getInstance();
+
+    switch ($dump_method) {
+    case SC_DUMP_PRINT_R:
+    default:
+        // Print human-readable descriptions of invisible types.
+        if (null === $var) {
+            $d = '(null)';
+        } else if (true === $var) {
+            $d = '(bool: true)';
+        } else if (false === $var) {
+            $d = '(bool: false)';
+        } else if (is_scalar($var) && '' === $var) {
+            $d = '(empty string)';
+        } else if (is_scalar($var) && preg_match('/^\s+$/', $var)) {
+            $d = '(only white space)';
+        } else {
+            ob_start();
+            print_r($var);
+            $d = ob_get_contents();
+            ob_end_clean();
+        }
+        break;
+
+    case SC_DUMP_VAR_DUMP:
+        ob_start();
+        print_r($var);
+        var_dump($var);
+        ob_end_clean();
+        break;
+
+    case SC_DUMP_VAR_EXPORT:
+        ob_start();
+        print_r($var);
+        var_export($var);
+        ob_end_clean();
+        break;
+
+    case SC_DUMP_JSON:
+        $d = json_encode($var, JSON_PRETTY_PRINT);
+        break;
+    }
     return $serialize ? preg_replace('/\s+/m' . $app->getParam('preg_u'), ' ', $d) : $d;
 }
@@ -1459 +1495 @@
 function ipInRange($addr, $networks)
 {
+    if (null == $addr || '' == trim($addr)) {
+        return false;
+    }
+
     if (!is_array($networks)) {
         $networks = array($networks);