From 7e6268df8c46e50db69d45c5ea5c4d2b2fa380f9 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 27 Apr 2006 22:16:13 +0000
Subject: [PATCH] better debugging

---
 lib/WebGUI/Session/ErrorHandler.pm | 11 ++++++++---
 sbin/upgrade.pl                    |  2 --
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm
index ea3b0d14c..38d6a7f12 100644
--- a/lib/WebGUI/Session/ErrorHandler.pm
+++ b/lib/WebGUI/Session/ErrorHandler.pm
@@ -17,8 +17,8 @@ package WebGUI::Session::ErrorHandler;
 
 use strict;
 use Log::Log4perl;
-use Data::Dumper;
 use Apache2::RequestUtil;
+use JSON;
 
 =head1 NAME 
 
@@ -397,14 +397,19 @@ sub showDebug {
 	my $text = $self->session->stow->get('debug_error');
 	$text =~  s/\n/\<br \/\>\n/g;
 	my $output = '<div style="text-align: left;background-color: #800000;color: #ffffff;">'.$text."</div>\n";
-	$text = $self->session->form->paramsHashRef();
-	$output .= '<div style="text-align: left;background-color: #ffffff;color: #000000;"><pre>Form Variables:'.Dumper($text)."</pre></div>\n" if(scalar(keys %{$text}));
 	$text = $self->session->stow->get('debug_warn'); 
 	$text =~  s/\n/\<br \/\>\n/g;
 	$output .= '<div style="text-align: left;background-color: #ffdddd;color: #000000;">'.$text."</div>\n";
 	$text = $self->session->stow->get('debug_info'); 
 	$text =~  s/\n/\<br \/\>\n/g;
 	$output .= '<div style="text-align: left;background-color: #ffffdd;color: #000000;">'.$text."</div>\n";
+	$text = JSON::objToJson($self->session->form->paramsHashRef(), {pretty=>1, indent=>4});
+	$text =~ s/&/&amp;/xsg;
+	$text =~ s/>/&gt;/xsg;
+	$text =~ s/</&lt;/xsg;
+	$text =~  s/\n/\<br \/\>\n/g;
+	$text =~  s/    /&nbsp; &nbsp; /g;
+	$output .= '<div style="text-align: left;background-color: #cccccc;color: #000000;">'.$text."</div>\n";
 	$text = $self->session->stow->get('debug_debug'); 
 	$text =~  s/\n/\<br \/\>\n/g;
 	$output .= '<div style="text-align: left;background-color: #dddddd;color: #000000;">'.$text."</div>\n";
diff --git a/sbin/upgrade.pl b/sbin/upgrade.pl
index b3be6caaa..81a28d43c 100644
--- a/sbin/upgrade.pl
+++ b/sbin/upgrade.pl
@@ -247,8 +247,6 @@ foreach my $filename (keys %config) {
 	my $dumpcmd = $config{$filename}{mysqlDump} || $mysqldump;
 	my $backupTo = $config{$filename}{backupPath} || $backupDir;
 	mkdir($backupTo);
-	print ("sql:".$upgrade{$config{$filename}{version}}{sql}."\n");
-	print ("pl:".$upgrade{$config{$filename}{version}}{pl}."\n");
 	while ($upgrade{$config{$filename}{version}}{sql} ne "" || $upgrade{$config{$filename}{version}}{pl} ne "") {
 		my $upgrade = $upgrade{$config{$filename}{version}}{from};
 		unless ($skipBackup) {