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

Timestamp:

May 3, 2014 3:13:19 PM (10 years ago)

Author:

anonymous

Message:

Added cookie storage to Prefs(). Created App->addCookie method. Improved PHP version checks.

File:

• trunk/lib/Utilities.inc.php (modified) (1 diff)

trunk/lib/Utilities.inc.php

@@ -29 +29 @@
  * Print variable dump.
  *
- * @param  mixed $var      Variable to dump.
- * @param  bool  $display   Hide the dump in HTML comments?
- * @param  bool  $var_dump Use var_dump instead of print_r.
+ * @param  mixed    $var        The variable to dump.
+ * @param  bool     $display    Print the dump in <pre> tags or hide it in html comments (non-CLI only).
+ * @param  bool     $var_dump   Use var_dump instead of print_r.
+ * @param  string   $file       Value of __FILE__.
+ * @param  string   $line       Value of __LINE__
  */
 function dump($var, $display=false, $var_dump=false, $file='', $line='')
 {
-    if (empty($var)) {
-        $var = '(nothing to dump)';
-    }
     if (defined('_CLI')) {
-        echo "\nDUMP FROM: $file $line\n";
-    } else {
-        echo $display ? "\n<br />DUMP: <strong>$file $line</strong>\n<br /><pre>\n" : "\n\n\n<!--\n$file $line\n";
+        echo "DUMP FROM: $file $line\n";
+    } else {
+        echo $display ? "\n<br />DUMP <strong>$file $line</strong><br /><pre>\n" : "\n<!-- DUMP $file $line\n";
     }
     if ($var_dump) {
         var_dump($var);
     } else {
-        print_r($var);
+        // Print human-readable descriptions of invisible types.
+        if (null === $var) {
+            echo '(null)';
+        } else if (true === $var) {
+            echo '(bool: true)';
+        } else if (false === $var) {
+            echo '(bool: false)';
+        } else if (is_scalar($var) && '' === $var) {
+            echo '(empty string)';
+        } else if (is_scalar($var) && preg_match('/^\s+$/', $var)) {
+            echo '(only white space)';
+        } else {
+            print_r($var);
+        }
     }
     if (defined('_CLI')) {
         echo "\n";
     } else {
-        echo $display ?  "\n</pre><br />\n" : "\n-->\n\n\n";
+        echo $display ? "\n</pre><br />\n" : "\n-->\n";
     }
 }