Index: trunk/tools/debug_sample.php
===================================================================
diff -u -r854 -r859
--- trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 854)
+++ trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 859)
@@ -6,7 +6,7 @@
 	define('DOC_ROOT', $_SERVER['DOCUMENT_ROOT']);
 	define('WINDOWS_ROOT', 'w:');
 	define('WINDOWS_EDITOR', 'c:\Program Files\Zend\ZendStudio-4.0Beta\bin\ZDE.exe %F'); // %F - filename, %L - line number
-	define('DEBUG_CSS', 'http://'.$_SERVER['HTTP_HOST'].'/in-portal/admin/include/debug_styles.css');
+	define('DBG_STYLESHEET', 'http://'.$_SERVER['HTTP_HOST'].'/in-portal/admin/include/debug_styles.css');
 	
 	//define('SQL_TO_SCREEN', 1);		// output sql queries to screen
 	
Index: trunk/kernel/include/adodb/adodb.inc.php
===================================================================
diff -u -r857 -r859
--- trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 857)
+++ trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 859)
@@ -728,7 +728,7 @@
 			{
 				$isSkipTable = isSkipTable($sql);
 				$queryID = $debugger->generateID();
-				if(!$isSkipTable) $debugger->profileStart('sql_'.$queryID, $debugger->highlightString($sql) );
+				if(!$isSkipTable) $debugger->profileStart('sql_'.$queryID, $debugger->formatSQL($sql) );
 				//$debugger->appendTrace();
 			}
 			$this->_queryID = $this->_query($sql,$inputarr,$arg3);
@@ -755,7 +755,7 @@
 					$errorLevel = defined('SQL_ERROR_DIE')&&SQL_ERROR_DIE ? E_USER_ERROR : E_USER_WARNING;
 					$debugger->dumpVars($_REQUEST);
 					$debugger->appendTrace();
-					trigger_error('<span class="debug_error">'.$m.' ('.$e.')</span><br><a href="javascript:SetClipboard(\''.addslashes($sql).'\');"><b>SQL</b></a>: '.$debugger->highlightString($sql), $errorLevel);
+					trigger_error('<span class="debug_error">'.$m.' ('.$e.')</span><br><a href="javascript:SetClipboard(\''.addslashes($sql).'\');"><b>SQL</b></a>: '.$debugger->formatSQL($sql), $errorLevel);
 					
 					ADOConnection::outp($e .': '. $m );
 					flush();
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r857 -r859
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 857)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 859)
@@ -1,6 +1,7 @@
 <?php
 	define('DBG_USE_HIGHLIGHT', 1);	
-
+	define('DBG_USE_SHUTDOWN_FUNC', 1);
+	
 	class Debugger 
 	{
 		/**
@@ -115,6 +116,20 @@
 			
 		}
 		
+		/**
+		 * Format SQL Query using predefined formatting
+		 * and highlighting techniques
+		 *
+		 * @param string $sql
+		 * @return string
+		 */
+		function formatSQL($sql)
+		{
+			$sql = preg_replace('/(\n|\t| )+/is',' ',$sql);
+			$sql = preg_replace('/(SELECT|UPDATE|REPLACE|INSERT|DELETE|VALUES|FROM|LEFT JOIN|WHERE|HAVING|GROUP BY|ORDER BY) /is', "\n\t$1 ",$sql);
+			return $this->highlightString($sql);
+		}
+		
 		function highlightString($string)
 		{
 			if( defined('DBG_USE_HIGHLIGHT')&&DBG_USE_HIGHLIGHT )
@@ -218,9 +233,9 @@
 		{
 			$i = 0; $lineCount = count($this->Data);
 			?>
-				<link rel="stylesheet" type="text/css" href="<?php echo DEBUG_CSS; ?>">
+				<link rel="stylesheet" type="text/css" href="<?php echo DBG_STYLESHEET; ?>">
 				<div id="debug_layer" class="debug_layer_container" style="display: none;">
-					<div style="padding: 0px;">
+					<div class="debug_layer">
 						<table width="100%" cellpadding="0" cellspacing="1" border="0" class="debug_layer_table">
 			<?php
 			while ($i < $lineCount)
@@ -394,12 +409,22 @@
 			}
 		}
 		
+		function saveToFile($msg)
+		{
+			$fp = fopen($_SERVER['DOCUMENT_ROOT'].'/vb_debug.txt', 'a');
+			fwrite($fp,$msg."\n");
+			fclose($fp);
+		}
+		
 	}
 	
 	$debugger = new Debugger();
 	$debugger->appendHTML('<a href="javascript:toggleDebugLayer();">Hide Debugger</a>');
 	
 	set_error_handler( array(&$debugger,'saveError')  );
-	register_shutdown_function( array(&$debugger,'printReport') );
+	if(defined('DBG_USE_SHUTDOWN_FUNC')&&DBG_USE_SHUTDOWN_FUNC)
+	{
+		register_shutdown_function( array(&$debugger,'printReport') );
+	}
 	
 ?>
\ No newline at end of file