Changeset 464

Timestamp:

Feb 8, 2014 2:29:30 AM (10 years ago)

Author:

anonymous

Message:

Added jsDump function. Updated Navigation::currentPage so test url and curr url both have the option to exclude the query string.

Location:

trunk/lib

Files:

• Navigation.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (2 diffs)

trunk/lib/Navigation.inc.php

@@ -279 +279 @@
      * @return  mixed   The value set for $return, TRUE by default.
      */
-    function currentPage($test_uri, $true_return=true, $false_return=false, $include_query=true)
-    {
-        $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : strtok($_SERVER['REQUEST_URI'], '?');
+    function currentPage($test_uri, $true_return=true, $false_return=false, $strip_query=false)
+    {
+        $actual_uri = $strip_query ? strtok($_SERVER['REQUEST_URI'], '?') : $_SERVER['REQUEST_URI'];
+        $test_uri = $strip_query ? strtok($test_uri, '?') : $test_uri;
         if (preg_match('/^' . preg_quote(urldecode($test_uri), '/') . '$/i', $actual_uri)) {
             return $true_return;

trunk/lib/Utilities.inc.php

@@ -33 +33 @@
  * @param  bool  $var_dump Use var_dump instead of print_r.
  */
-function dump($var, $display=false, $var_dump=false)
+function dump($var, $display=false, $var_dump=false, $file, $line)
 {
     if (defined('_CLI')) {
@@ -52 +52 @@
 }
 
-/**
- * Return dump as variable.
- *
- * @param  mixed $var           Variable to dump.
- * @param  bool  $serialize     Remove line-endings. Useful for logging variables.
- * @return string Dump of var.
- */
+/*
+* Log a PHP variable to javascript console. Relies on getDump(), below.
+*
+* @access   public
+* @param    mixed   $var      The variable to dump.
+* @param    string  $prefix   A short note to print before the output to make identifying output easier.
+* @param    string  $file     The value of __FILE__.
+* @param    string  $line     The value of __LINE__.
+* @return   null
+* @author   Quinn Comendant <quinn@strangecode.com>
+*/
+function jsDump($var, $prefix='jsDump', $file='-', $line='-')
+{
+    if (!empty($var)) {
+        ?>
+        <script type="text/javascript" charset="utf-8">
+        /* <![CDATA[ */
+        window.console && console.log('<?php printf('%s: %s (on line %s of %s)', $prefix, str_replace("'", "\\'", getDump($var, true)), $line, $file); ?>');
+        /* ]]> */
+        </script>
+        <?php
+    }
+}
+
+/*
+* Return a string version of any variable, optionally serialized on one line.
+*
+* @access   public
+* @param    mixed   $var        The variable to dump.
+* @param    bool    $serialize  If true, remove line-endings. Useful for logging variables.
+* @return   string              The dumped variable.
+* @author   Quinn Comendant <quinn@strangecode.com>
+*/
 function getDump($var, $serialize=false)
 {