Index: trunk/tools/debug_sample.php
===================================================================
diff -u -r859 -r874
--- trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 859)
+++ trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 874)
@@ -19,12 +19,7 @@
 	define('SQL_OUTPUT', DOC_ROOT.'/inportal_sqls.txt'); // file where to store sql queries
 	define('SQL_OVERWRITE', 1); 	// overwrite or not sql_log file
 	
-	// various levels of debugging
-	define('SHOW_REQUEST', 1);
-	define('FRONT_SHOW_REQUEST', 2);
-	
 	define('DEBUG_MODE', 1); // global debugging
-	define('DEBUG_ACTIONS', SHOW_REQUEST + FRONT_SHOW_REQUEST);
 	//define('DEBUG_HELP', 1); // allow to add missing help 
 
 	if( defined('DEBUG_MODE') && constant('DEBUG_MODE') == 1 )
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -r858 -r874
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 858)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 874)
@@ -1,34 +1,10 @@
 <?php
 
 // ====== Debugger related: begin ======
-if( defined('DEBUG_ACTIONS') )
+if( IsDebugMode() )
 {
-	if( (DEBUG_ACTIONS & FRONT_SHOW_REQUEST) == FRONT_SHOW_REQUEST )
-	{
-		if($Action) $debugger->appendHTML('Front Action: <b>'.$Action.'</b>');
-		$script = basename($_SERVER['PATH_TRANSLATED']);
-		$debugger->appendHTML('ScriptName: <b>'.$script.'</b> (<b>'.dirname($_SERVER['PATH_TRANSLATED']).'</b>)');
-		$requestTable = '<table width="100%" border="0" cellspacing="0" cellpadding="4" class="flat_table">
-						<thead style="font-weight: bold;"><td width="20">Src</td><td>Name</td><td>Value</td></thead>';
-
-		foreach($_REQUEST as $key => $value)
-		{
-			if( !is_array($value) && trim($value) == '' )
-			{
-				$value = '<b class="debug_error">no value</b>';
-			}
-			else
-			{
-				$value = htmlspecialchars(print_r($value, true));
-			}
-			$src = isset($_GET[$key]) ? 'GE' : (isset($_POST[$key]) ? 'PO' : (isset($_COOKIE[$key]) ? 'CO' : '?') );
-			$requestTable .= '<tr><td>'.$src.'</td><td>'.$key.'</td><td>'.$value.'</td></tr>';
-		}
-		$requestTable .= '</table>';
-		$debugger->appendHTML($requestTable);
-		unset($script, $requestTable);
-		echo '<a href="javascript:toggleDebugLayer();">Show Debugger</a><br>';
-	}
+	if($Action) $debugger->setHTMLByIndex(1,'Front Action: <b>'.$Action.'</b>','append');
+	echo '<a href="javascript:toggleDebugLayer();">Show Debugger</a><br>';
 }
 // ====== Debugger related: end ======
 
Index: trunk/kernel/action.php
===================================================================
diff -u -r869 -r874
--- trunk/kernel/action.php	(.../action.php)	(revision 869)
+++ trunk/kernel/action.php	(.../action.php)	(revision 874)
@@ -7,36 +7,9 @@
 $skipDebug = Array('index.php','tree.php','head.php','credits.php');
 if( admin_login() && !in_array($script, $skipDebug) )
 {
-	if( defined('DEBUG_ACTIONS') )
-	{
-		if( (DEBUG_ACTIONS & SHOW_REQUEST) == SHOW_REQUEST )
-		{
-			if($Action) $debugger->appendHTML('Kernel Action: <b>'.$Action.'</b>');
-			$debugger->appendHTML('ScriptName: <b>'.$debugger->getFileLink($_SERVER['PATH_TRANSLATED'],1,$script).'</b> (<b>'.dirname($_SERVER['PHP_SELF']).'</b>)');
-			$requestTable = '<table width="100%" border="0" cellspacing="0" cellpadding="4" class="flat_table">
-							<thead style="font-weight: bold;"><td width="20">Src</td><td>Name</td><td>Value</td></thead>';
-
-			foreach($_REQUEST as $key => $value)
-			{
-				if( !is_array($value) && trim($value) == '' )
-				{
-					$value = '<b class="debug_error">no value</b>';
-				}
-				else
-				{
-					$value = htmlspecialchars(print_r($value, true));
-				}
-				$src = isset($_GET[$key]) ? 'GE' : (isset($_POST[$key]) ? 'PO' : (isset($_COOKIE[$key]) ? 'CO' : '?') );
-				$requestTable .= '<tr><td>'.$src.'</td><td>'.$key.'</td><td>'.$value.'</td></tr>';
-			}
-			$requestTable .= '</table>';
-			$debugger->appendHTML($requestTable);
-			unset($requestTable);
-		}
-	}
-	
 	if( IsDebugMode() )
 	{
+		if($Action) $debugger->setHTMLByIndex(1,'Kernel Action: <b>'.$Action.'</b>','append');
 		echo '<a href="javascript:self.location.reload();">Reload Frame</a> || ';
 		echo '<a href="javascript:toggleDebugLayer();">Show Debugger</a><br>';
 	}
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r872 -r874
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 872)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 874)
@@ -13,6 +13,12 @@
 		var $ProfilerData = Array();
 		var $RecursionStack = Array();	// prevent recursion when processing debug_backtrace() function results
 		
+		function Debugger()
+		{
+			$this->appendHTML('<a href="javascript:toggleDebugLayer();">Hide Debugger</a>');
+			$this->appendRequest();
+		}
+		
 		function dumpVars()
 		{
 			$dumpVars = func_get_args();
@@ -165,6 +171,68 @@
 			$this->Data[] = Array('html' => $html,'debug_type' => 'html');	
 		}
 		
+		/**
+		 * Change debugger info that was already generated before.
+		 * Returns true if html was set.
+		 *
+		 * @param int $index
+		 * @param string $html
+		 * @param string $type = {'append','prepend','replace'}
+		 * @return bool
+		 */
+		function setHTMLByIndex($index,$html,$type='append')
+		{
+			if( !isset($this->Data[$index]) || $this->Data[$index]['debug_type'] != 'html' )
+			{
+				return false;	
+			}
+			
+			switch ($type)
+			{
+				case 'append':
+					$this->Data[$index]['html'] .= '<br>'.$html;
+					break;
+				case 'prepend':
+					$this->Data[$index]['html'] = $this->Data[$index]['html'].'<br>'.$html;
+					break;
+				case 'replace':
+					$this->Data[$index]['html'] = $html;
+					break;
+			}
+			return true;
+		}
+		
+		function appendRequest()
+		{
+			$script = $_SERVER['PATH_TRANSLATED'];
+			$this->appendHTML('ScriptName: <b>'.$this->getFileLink($script,1,basename($script)).'</b> (<b>'.dirname($script).'</b>)');
+			ob_start();
+			?>
+			<table width="100%" border="0" cellspacing="0" cellpadding="4" class="flat_table">
+				<thead style="font-weight: bold;">
+					<td width="20">Src</td><td>Name</td><td>Value</td>
+				</thead>
+			<?php
+				foreach($_REQUEST as $key => $value)
+				{
+					if( !is_array($value) && trim($value) == '' )
+					{
+						$value = '<b class="debug_error">no value</b>';
+					}
+					else
+					{
+						$value = htmlspecialchars(print_r($value, true));
+					}
+					$src = isset($_GET[$key]) ? 'GE' : (isset($_POST[$key]) ? 'PO' : (isset($_COOKIE[$key]) ? 'CO' : '?') );
+					echo '<tr><td>'.$src.'</td><td>'.$key.'</td><td>'.$value.'</td></tr>';
+				}
+			?> 
+			</table>
+			<?php
+			$this->appendHTML( ob_get_contents() );
+			ob_end_clean();
+		}
+		
 		function profileStart($key, $description)
 		{
 			$timeStamp = $this->getMoment();
@@ -228,9 +296,10 @@
 		 * Generates report
 		 *
 		 */
-		function printReport()
+		function printReport($returnResult = false)
 		{
 			$i = 0; $lineCount = count($this->Data);
+			ob_start();
 			?>
 				<style type="text/css">
 					.flat_table TD {
@@ -438,6 +507,17 @@
 					}
 				</script>
 			<?php
+			
+			if($returnResult)
+			{
+				$ret = ob_get_contents();
+				ob_clean();
+				return $ret;
+			}
+			else 
+			{
+				ob_end_flush();
+			}
 		}
 		
 		/**
@@ -481,8 +561,6 @@
 	}
 	
 	$debugger = new Debugger();
-	$debugger->appendHTML('<a href="javascript:toggleDebugLayer();">Hide Debugger</a>');
-	
 	if(ConstOn('DBG_HANDLE_ERRORS')) set_error_handler( array(&$debugger,'saveError')  );
 	if(ConstOn('DBG_USE_SHUTDOWN_FUNC')) register_shutdown_function( array(&$debugger,'printReport') );