From 8d0ba934364fbb65e66edf1b2cda24ebd8afb96b Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Wed, 11 Aug 2010 22:24:08 -0700
Subject: [PATCH] make debugging safe

---
 include/dba.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 09d07322c0..48dcc12a98 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -65,11 +65,9 @@ class dba {
 		}
     
 		if($this->debug == 2)
-			$debug_text .= print_r($r, true). EOL;
-//			$debug_text .= quoted_printable_encode(print_r($r, true). EOL);
+			$debug_text .= printable(print_r($r, true). EOL);
 		elseif($this->debug == 3)
-			echo print_r($r, true) . EOL ;
-//			echo quoted_printable_encode(print_r($r, true) . EOL) ;
+			echo printable(print_r($r, true) . EOL) ;
 
 		return($r);
 	}
@@ -87,6 +85,12 @@ class dba {
 	}
 }}
 
+if(! function_exists('printable')) {
+function printable($s) {
+	$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
+	return(escape_tags(str_replace("\x00",'.',$s)));
+}}
+
 // Procedural functions
 if(! function_exists('dbg')) { 
 function dbg($state) {