Changeset 331

Timestamp:

May 6, 2008 7:49:25 PM (16 years ago)

Author:

quinn

Message:

Truncating output from getDump when used for logging.

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• ImageThumb.inc.php (modified) (1 diff)
• PayPal.inc.php (modified) (3 diffs)
• Prefs.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -662 +662 @@
                 // Copy the value of the specified query argument into the _carry_queries array.
                 $this->_carry_queries[$k] = getFormData($k, $default);
-                $this->logMsg(sprintf('Carrying query: %s => %s', $k, $this->_carry_queries[$k]), LOG_DEBUG, __FILE__, __LINE__);
+                $this->logMsg(sprintf('Carrying query: %s => %s', $k, truncate(getDump($this->_carry_queries[$k], true), 128, 'end')), LOG_DEBUG, __FILE__, __LINE__);
             }
         }

trunk/lib/ImageThumb.inc.php

@@ -482 +482 @@
         } else {
             // An error occurred.
-            $app->logMsg(sprintf('Image %s failed resizing with return value: %s%s', $spec['dest_dir'] . '/' . basename($dest_file), $return_val, empty($output) ? '' : ' (' . getDump($output) . ')'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Image %s failed resizing with return value: %s%s', $spec['dest_dir'] . '/' . basename($dest_file), $return_val, empty($output) ? '' : ' (' . truncate(getDump($output, true), 128, 'end') . ')'), LOG_ERR, __FILE__, __LINE__);
         }
 

trunk/lib/PayPal.inc.php

@@ -80 +80 @@
 
         if (!is_array($options) || empty($options)) {
-            $app->logMsg(sprintf('Invalid options: %s', getDump($options)), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Invalid options: %s', truncate(getDump($options, true), 128, 'end')), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -117 +117 @@
 
         if (!is_array($options) || empty($options)) {
-            $app->logMsg(sprintf('Invalid options: %s', getDump($options)), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Invalid options: %s', truncate(getDump($options, true), 128, 'end')), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
 
         if (isset($this->_buttons[$name])) {
-            $app->logMsg(sprintf('Overwriting existing button name: %s', getDump($this->_buttons[$name])), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Overwriting existing button name: %s', truncate(getDump($this->_buttons[$name], true), 128, 'end')), LOG_DEBUG, __FILE__, __LINE__);
         }
 
@@ -275 +275 @@
 
         if (getPost('test_ipn') == '1' || $this->getParam('test_mode')) {
-            $app->logMsg(sprintf('Processing PayPal IPN in test mode: %s', getDump(getFormData())), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Processing PayPal IPN in test mode: %s', truncate(getDump(getFormData(), true), 128, 'end')), LOG_DEBUG, __FILE__, __LINE__);
             $url = parse_url('https://www.sandbox.paypal.com/cgi-bin/webscr');
         } else {
-            $app->logMsg(sprintf('Processing PayPal IPN: %s', getDump(getFormData())), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Processing PayPal IPN: %s', truncate(getDump(getFormData(), true), 128, 'end')), LOG_DEBUG, __FILE__, __LINE__);
             $url = parse_url($this->getParam('paypal_url'));
         }

trunk/lib/Prefs.inc.php

@@ -186 +186 @@
         if (!isset($_SESSION['_prefs'][$this->_ns]['defaults'][$key]) || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val || isset($_SESSION['_prefs'][$this->_ns]['persistent'][$key])) {
             $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;            
-            $app->logMsg(sprintf('Setting preference %s => %s', $key, getDump($val)), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Setting preference %s => %s', $key, truncate(getDump($val, true), 128, 'end')), LOG_DEBUG, __FILE__, __LINE__);
         } else {
-            $app->logMsg(sprintf('Not setting preference %s => %s', $key, getDump($val)), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Not setting preference %s => %s', $key, truncate(getDump($val, true), 128, 'end')), LOG_DEBUG, __FILE__, __LINE__);
         }
     }

trunk/lib/Utilities.inc.php

@@ -27 +27 @@
  * Return dump as variable.
  *
- * @param  mixed $var      Variable to dump.
+ * @param  mixed $var           Variable to dump.
+ * @param  bool  $serialize     Remove line-endings. Useful for logging variables.
  * @return string Dump of var.
  */
-function getDump($var)
+function getDump($var, $serialize=false)
 {
     ob_start();
@@ -36 +37 @@
     $d = ob_get_contents();
     ob_end_clean();
-    return $d;
+    return $serialize ? preg_replace('/\s+/m', '', $d) : $d;
 }