Index: trunk/core/kernel/application.php
===================================================================
diff -u -r4790 -r4814
--- trunk/core/kernel/application.php	(.../application.php)	(revision 4790)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 4814)
@@ -1834,7 +1834,7 @@
 			$this->Debugger->dumpVars($_REQUEST);
 			$this->Debugger->appendTrace();
 
-			$error_msg = '<span class="debug_error">'.$msg.' ('.$code.')</span><br><a href="javascript:SetClipboard(\''.htmlspecialchars($sql).'\');"><b>SQL</b></a>: '.$this->Debugger->formatSQL($sql);
+			$error_msg = '<span class="debug_error">'.$msg.' ('.$code.')</span><br><a href="javascript:$Debugger.SetClipboard(\''.htmlspecialchars($sql).'\');"><b>SQL</b></a>: '.$this->Debugger->formatSQL($sql);
 			$long_id = $this->Debugger->mapLongError($error_msg);
 			trigger_error( substr($msg.' ('.$code.') ['.$sql.']',0,1000).' #'.$long_id, $errorLevel);
 			return true;
Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -r4758 -r4814
--- trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4758)
+++ trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4814)
@@ -1,44 +1,42 @@
 <?php
 
-	if( !class_exists('Debugger') )
-	{
-		function dbg_ConstOn($const_name)
-		{
+	if( !class_exists('Debugger') ) {
+		function dbg_ConstOn($const_name) {
 			return defined($const_name) && constant($const_name);
 		}
 
-		function dbg_safeDefine($const_name,$const_value)
-		{
-			if(!defined($const_name)) define($const_name,$const_value);
+		function dbg_safeDefine($const_name, $const_value) {
+			if (!defined($const_name)) {
+				define($const_name, $const_value);
+			}
 		}
 
 		unset($_REQUEST['debug_host'], $_REQUEST['debug_fastfile']);	// this var messed up whole detection stuff :(
 
 		// Detect fact, that this session beeing debugged by Zend Studio
-		foreach($_REQUEST as $rq_name=>$rq_value)
-		{
-			if( substr($rq_name,0,6)=='debug_' )
-			{
+		foreach ($_REQUEST as $rq_name => $rq_value) {
+			if (substr($rq_name, 0, 6) == 'debug_') {
 				dbg_safeDefine('DBG_ZEND_PRESENT', 1);
 				break;
 			}
 		}
 
-		dbg_safeDefine('DBG_ZEND_PRESENT',0);
+		dbg_safeDefine('DBG_ZEND_PRESENT', 0);
 
 		// set default values for debugger constants
-		$dbg_constMap=Array('DBG_OPTIONS'=>0,
-							'DBG_USE_HIGHLIGHT'=>1,
-							'DBG_USE_SHUTDOWN_FUNC'=>DBG_ZEND_PRESENT?0:1,
-							'DBG_HANDLE_ERRORS'=>DBG_ZEND_PRESENT?0:1,
-							'DBG_IGNORE_STRICT_ERRORS'=>1,
-							'DBG_DOMVIEWER'=>'/temp/domviewer.html',
-							'DOC_ROOT'=> str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
-							'DBG_LOCAL_BASE_PATH'=>'w:');
+		$dbg_constMap = Array(	
+								'DBG_OPTIONS'				=>	0,
+								'DBG_USE_HIGHLIGHT'			=>	1,
+								'DBG_USE_SHUTDOWN_FUNC'		=>	DBG_ZEND_PRESENT ? 0 : 1,
+								'DBG_HANDLE_ERRORS'			=>	DBG_ZEND_PRESENT ? 0 : 1,
+								'DBG_IGNORE_STRICT_ERRORS'	=>	1,
+								'DBG_DOMVIEWER'				=>	'/temp/domviewer.html',
+								'DOC_ROOT'					=>	str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
+								'DBG_LOCAL_BASE_PATH'		=>	'w:'
+						);
 
-		foreach($dbg_constMap as $dbg_constName=>$dbg_constValue)
-		{
-			dbg_safeDefine($dbg_constName,$dbg_constValue);
+		foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) {
+			dbg_safeDefine($dbg_constName, $dbg_constValue);
 		}
 
 		// only for IE, in case if no windows php script editor defined
@@ -51,8 +49,10 @@
 			unset($dbg_editors,$dbg_editor);
 		}*/
 
-		class Debugger
-		{
+		class Debugger {
+			
+			var $IsFatalError = false;
+			
 			/**
 			 * Debugger data for building report
 			 *
@@ -62,16 +62,24 @@
 			var $ProfilerData = Array();
 			var $ProfilerTotals = Array();
 			var $ProfilerTotalCount = Array();
-			var $RecursionStack = Array();	// prevent recursion when processing debug_backtrace() function results
+			
+			/**
+			 * Prevent recursion when processing debug_backtrace() function results
+			 *
+			 * @var Array
+			 */
+			var $RecursionStack = Array();
 
-			var $TraceNextError=false;
-
 			var $Options = 0;
-			var $OptionsMap = Array('shutdown_func' => 1, 'error_handler' => 2,
-									'output_buffer' => 4, 'highlight_output' => 8);
+			var $OptionsMap = Array('shutdown_func' => 1, 'error_handler' => 2, 'output_buffer' => 4, 'highlight_output' => 8);
 
 			var $scrollbarWidth = 0;
 
+			/**
+			 * Long errors are saved here, because trigger_error doesn't support error messages over 1KB in size
+			 *
+			 * @var Array
+			 */
 			var $longErrors = Array();
 
 			/**
@@ -92,6 +100,7 @@
 			function Debugger()
 			{
 				$this->dummyImage = PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').'/'.'kernel/admin_templates/img/spacer.gif';
+				
 				global $start;
 				$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
 				$this->profileStart('script_runtime', 'Script runtime', $start);
@@ -103,65 +112,62 @@
 				$this->appendRequest();
 			}
 
-			function initOptions()
-			{
-
-			}
-
 			function mapLongError($msg)
 			{
-				$key=$this->generateID();
-				$this->longErrors[$key]=$msg;
+				$key = $this->generateID();
+				$this->longErrors[$key] = $msg;
 				return $key;
 			}
 
-			function setOption($name,$value)
+			/*function initOptions()
 			{
-				if( !isset($this->OptionsMap[$name]) ) die('undefined debugger option: ['.$name.']<br>');
-				if($value)
-				{
-					$this->Options|=$this->OptionsMap[$name];
+
+			}
+			
+			function setOption($name, $value)
+			{
+				if (!isset($this->OptionsMap[$name])) {
+					die('undefined debugger option: ['.$name.']<br>');
 				}
-				else
-				{
-					$this->Options=$this->Options&~$this->OptionsMap[$name];
+				
+				if ($value) {
+					$this->Options |= $this->OptionsMap[$name];
 				}
+				else {
+					$this->Options = $this->Options &~ $this->OptionsMap[$name];
+				}
 			}
 
 			function getOption($name)
 			{
-				if( !isset($this->OptionsMap[$name]) ) die('undefined debugger option: ['.$name.']<br>');
+				if (!isset($this->OptionsMap[$name])) {
+					die('undefined debugger option: ['.$name.']<br>');
+				}
 	    		return ($this->Options & $this->OptionsMap[$name]) == $this->OptionsMap[$name];
-			}
-
+			}*/
+			
 			/**
-			 * Set's flag, that next error that occurs will
-			 * be prepended by backtrace results
+			 * Appends all passed variable values (wihout variable names) to debug output
 			 *
 			 */
-			function traceNext()
-			{
-				$this->TraceNextError = true;
-			}
-
 			function dumpVars()
 			{
 				$dumpVars = func_get_args();
-				foreach($dumpVars as $varValue)
-				{
+				foreach ($dumpVars as $varValue) {
 					$this->Data[] = Array('value' => $varValue, 'debug_type' => 'var_dump');
 				}
 			}
 
 			function prepareHTML($dataIndex)
 			{
 				$Data =& $this->Data[$dataIndex];
-				if($Data['debug_type'] == 'html') return $Data['html'];
+				if ($Data['debug_type'] == 'html') {
+					return $Data['html'];
+				}
 
-				switch($Data['debug_type'])
-				{
+				switch ($Data['debug_type']) {
 					case 'error':
-						$fileLink = $this->getFileLink($Data['file'],$Data['line']);
+						$fileLink = $this->getFileLink($Data['file'], $Data['line']);
 						$ret = '<b class="debug_error">'.$this->getErrorNameByCode($Data['no']).'</b>: '.$Data['str'];
 						$ret .= ' in <b>'.$fileLink.'</b> on line <b>'.$Data['line'].'</b>';
 						return $ret;
@@ -172,38 +178,30 @@
 						break;
 
 					case 'trace':
-						ini_set('memory_limit','500M');
+						ini_set('memory_limit', '500M');
 						$trace =& $Data['trace'];
 
-						//return 'sorry';
-						//return $this->highlightString(print_r($trace,true));
-
-
 						$i = 0; $traceCount = count($trace);
 						$ret = '';
-						while($i < $traceCount)
-						{
+						while ($i < $traceCount) {
 							$traceRec =& $trace[$i];
 							$argsID = 'trace_args_'.$dataIndex.'_'.$i;
 
 							$has_args = isset($traceRec['args']);
 
-							if(isset($traceRec['file']))
-							{
-								$func_name=isset($traceRec['class'])?$traceRec['class'].$traceRec['type'].$traceRec['function']:$traceRec['function'];
-								$args_link = $has_args ? '<a href="javascript:toggleTraceArgs(\''.$argsID.'\');" title="Show/Hide Function Arguments"><b>Function</b></a>' : '<b>Function</b>';
+							if (isset($traceRec['file'])) {
+								$func_name = isset($traceRec['class']) ? $traceRec['class'].$traceRec['type'].$traceRec['function'] : $traceRec['function'];
+								$args_link = $has_args ? '<a href="javascript:$Debugger.ToggleTraceArgs(\''.$argsID.'\');" title="Show/Hide Function Arguments"><b>Function</b></a>' : '<b>Function</b>';
 
-								$ret .= $args_link.': '.$this->getFileLink($traceRec['file'],$traceRec['line'],$func_name);
+								$ret .= $args_link.': '.$this->getFileLink($traceRec['file'], $traceRec['line'], $func_name);
 								$ret .= ' in <b>'.basename($traceRec['file']).'</b> on line <b>'.$traceRec['line'].'</b><br>';
 							}
-							else
-							{
+							else {
 								$ret .= 'no file information available';
 							}
 
 							// ensure parameter value is not longer then 200 symbols
-							if($has_args)
-							{
+							if ($has_args) {
 								$this->processTraceArguments($traceRec['args']);
 								$args = $this->highlightString(print_r($traceRec['args'], true));
 								$ret .= '<div id="'.$argsID.'" style="display: none;">'.$args.'</div>';
@@ -218,7 +216,6 @@
 						$Data =& $this->ProfilerData[$profileKey];
 						$runtime = ($Data['ends'] - $Data['begins']); // in seconds
 
-
 						$totals_key = getArrayValue($Data, 'totalsKey');
 						if ($totals_key) {
 							$total_before = $Data['totalsBefore'];
@@ -265,48 +262,43 @@
 				if(!$traceArgs) return '';
 
 				$array_keys = array_keys($traceArgs);
-				foreach($array_keys as $argID)
-				{
+				foreach ($array_keys as $argID) {
 					$argValue =& $traceArgs[$argID];
 
-					if( is_array($argValue) || is_object($argValue) )
-					{
-						if(is_object($argValue) && !in_array(get_class($argValue),$this->RecursionStack) )
-						{
+					if (is_array($argValue) || is_object($argValue)) {
+						if (is_object($argValue) && !in_array(get_class($argValue),$this->RecursionStack)) {
 							array_push($this->RecursionStack, get_class($argValue));
 
-							if( strtolower(get_class($argValue)) == 'kfactory' || $this->isApplication($argValue) || strtolower(get_class($argValue)) == 'templateparser' )
-							{
+							if (strtolower(get_class($argValue)) == 'kfactory' || $this->isApplication($argValue) || strtolower(get_class($argValue)) == 'templateparser') {
 								$argValue = null;
 								continue;
 							}
 
 							// object & not in stack - ok
-							settype($argValue,'array');
+							settype($argValue, 'array');
 							$this->processTraceArguments($argValue);
 							array_pop($this->RecursionStack);
 						}
-						elseif(is_object($argValue) && in_array(get_class($argValue),$this->RecursionStack) )
-						{
+						elseif (is_object($argValue) && in_array(get_class($argValue),$this->RecursionStack)) {
 							// object & in stack - recursion
 							$traceArgs[$argID] = '**** RECURSION ***';
 						}
-						else
-						{
+						else {
 							// normal array here
 							$this->processTraceArguments($argValue);
 						}
 					}
-					else
-					{
+					else {
 						$traceArgs[$argID] = $this->cutStringForHTML($traceArgs[$argID]);
 					}
 				}
 			}
 
 			function cutStringForHTML($string)
 			{
-				if( strlen($string) > 200 ) $string = substr($string,0,50).' ...';
+				if (strlen($string) > 200) {
+					$string = substr($string,0,50).' ...';
+				}
 				return $string;
 			}
 
@@ -326,17 +318,14 @@
 
 			function highlightString($string)
 			{
-				if( dbg_ConstOn('DBG_USE_HIGHLIGHT') )
-				{
-					$string = str_replace( Array('\\', '/') , Array('_no_match_string_', '_n_m_s_'), $string);
-					$string = highlight_string('<?php '.$string.'?>', true);
-					$string = str_replace( Array('_no_match_string_', '_n_m_s_'), Array('\\', '/'), $string);
-					return preg_replace('/&lt;\?(.*)php(.*)\?&gt;/Us', '\\2', $string);
-				}
-				else
-				{
+				if (!dbg_ConstOn('DBG_USE_HIGHLIGHT')) {
 					return $string;
 				}
+				
+				$string = str_replace( Array('\\', '/') , Array('_no_match_string_', '_n_m_s_'), $string);
+				$string = highlight_string('<?php '.$string.'?>', true);
+				$string = str_replace( Array('_no_match_string_', '_n_m_s_'), Array('\\', '/'), $string);
+				return preg_replace('/&lt;\?(.*)php(.*)\?&gt;/Us', '\\2', $string);
 			}
 
 			function isGecko()
@@ -346,13 +335,15 @@
 
 			function getFileLink($file, $lineno = 1, $title = '')
 			{
-				if (!$title) $title = $file;
+				if (!$title) {
+					$title = $file;
+				}
 
 				if ($this->isGecko()) {
 					return '<a href="file://'.$this->getLocalFile($file).'">'.$title.'</a>';
 				}
 				else {
-					return '<a href="javascript:editFile(\''.$this->getLocalFile($file).'\','.$lineno.');" title="'.$file.'">'.$title.'</a>';
+					return '<a href="javascript:$Debugger.editFile(\''.$this->getLocalFile($file).'\','.$lineno.');" title="'.$file.'">'.$title.'</a>';
 				}
 
 			}
@@ -361,20 +352,29 @@
 			{
 				return str_replace(DOC_ROOT, DBG_LOCAL_BASE_PATH, $remoteFile);
 			}
-
+			
+			/**
+			 * Appends call trace till this method call
+			 *
+			 */
 			function appendTrace()
 			{
 				$trace = debug_backtrace();
 				array_shift($trace);
 				$this->Data[] = Array('trace' => $trace, 'debug_type' => 'trace');
 			}
 
-			function appendMemoryUsage($msg, $used=null)
+			function appendMemoryUsage($msg, $used = null)
 			{
 				if (!isset($used)) $used = round(memory_get_usage()/1024);
 				$this->appendHTML('<b>Memory usage</b> '.$msg.' '.$used.'Kb');
 			}
-
+			
+			/**
+			 * Appends HTML code whithout transformations
+			 *
+			 * @param string $html
+			 */
 			function appendHTML($html)
 			{
 				$this->Data[] = Array('html' => $html,'debug_type' => 'html');
@@ -389,21 +389,21 @@
 			 * @param string $type = {'append','prepend','replace'}
 			 * @return bool
 			 */
-			function setHTMLByIndex($index,$html,$type='append')
+			function setHTMLByIndex($index, $html, $type = 'append')
 			{
-				if( !isset($this->Data[$index]) || $this->Data[$index]['debug_type'] != 'html' )
-				{
+				if (!isset($this->Data[$index]) || $this->Data[$index]['debug_type'] != 'html') {
 					return false;
 				}
 
-				switch ($type)
-				{
+				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;
@@ -441,7 +441,7 @@
 
 				$this->appendHTML('ScriptName: <b>'.$this->getFileLink($script,1,basename($script)).'</b> (<b>'.dirname($script).'</b>)');
 
-				$this->appendHTML('<a href="http://www.brainjar.com/dhtml/domviewer/" target="_blank">DomViewer</a>: <input id="dbg_domviewer" type="text" value="window" style="border: 1px solid #000000;"/>&nbsp;<button class="button" onclick="return dbg_OpenDOMViewer();">Show</button>');
+				$this->appendHTML('<a href="http://www.brainjar.com/dhtml/domviewer/" target="_blank">DomViewer</a>: <input id="dbg_domviewer" type="text" value="window" style="border: 1px solid #000000;"/>&nbsp;<button class="button" onclick="return $Debugger.OpenDOMViewer();">Show</button>');
 
 				ob_start();
 				?>
@@ -450,14 +450,11 @@
 						<td width="20">Src</td><td>Name</td><td>Value</td>
 					</thead>
 				<?php
-					foreach($_REQUEST as $key => $value)
-					{
-						if( !is_array($value) && trim($value) == '' )
-						{
+					foreach ($_REQUEST as $key => $value) {
+						if(!is_array($value) && trim($value) == '') {
 							$value = '<b class="debug_error">no value</b>';
 						}
-						else
-						{
+						else {
 							$value = htmlspecialchars(print_r($value, true));
 						}
 
@@ -474,15 +471,14 @@
 
 			function appendSession()
 			{
-				if( isset($_SESSION)&&$_SESSION )
-				{
+				if(isset($_SESSION) && $_SESSION) {
 					$this->appendHTML('PHP Session: [<b>'.ini_get('session.name').'</b>]');
 					$this->dumpVars($_SESSION);
 					$this->moveToBegin(2);
 				}
 			}
 
-			function profileStart($key, $description = null, $timeStamp=null)
+			function profileStart($key, $description = null, $timeStamp = null)
 			{
 				if (!isset($timeStamp)) {
 					$timeStamp = $this->getMoment();
@@ -495,7 +491,7 @@
 				$this->Data[] = array('profile_key' => $key, 'debug_type' => 'profiler');
 			}
 
-			function profileFinish($key, $description = null, $timeStamp=null)
+			function profileFinish($key, $description = null, $timeStamp = null)
 			{
 				if (!isset($timeStamp)) {
 					$timeStamp = $this->getMoment();
@@ -507,12 +503,13 @@
 				}
 			}
 
-			function profilerAddTotal($total_key, $key=null, $value=null)
+			function profilerAddTotal($total_key, $key = null, $value = null)
 			{
 				if (!isset($this->ProfilerTotals[$total_key])) {
 					$this->ProfilerTotals[$total_key] = 0;
 					$this->ProfilerTotalCount[$total_key] = 0;
 				}
+				
 				if (!isset($value)) {
 					$value = $this->ProfilerData[$key]['ends'] - $this->ProfilerData[$key]['begins'];
 				}
@@ -534,15 +531,15 @@
 
 			function generateID()
 			{
-				list($usec, $sec) = explode(" ",microtime());
+				list($usec, $sec) = explode(' ', microtime());
 
 				$id_part_1 = substr($usec, 4, 4);
 				$id_part_2 = mt_rand(1,9);
 				$id_part_3 = substr($sec, 6, 4);
 				$digit_one = substr($id_part_1, 0, 1);
 				if ($digit_one == 0) {
 					$digit_one = mt_rand(1,9);
-					$id_part_1 = ereg_replace("^0","",$id_part_1);
+					$id_part_1 = ereg_replace("^0",'',$id_part_1);
 					$id_part_1=$digit_one.$id_part_1;
 				}
 				return $id_part_1.$id_part_2.$id_part_3;
@@ -551,8 +548,7 @@
 
 			function getErrorNameByCode($errorCode)
 			{
-				switch($errorCode)
-				{
+				switch ($errorCode) {
 					case E_USER_ERROR:
 						return 'Fatal Error';
 						break;
@@ -585,38 +581,33 @@
 			{
 				$this->breakOutofBuffering();
 				if($this->reportDone) return '';
-
-				if( dbg_ConstOn('DBG_SKIP_REPORTING') ) return;
-
 				$this->profileFinish('script_runtime');
-				if( dbg_ConstOn('DBG_ZEND_PRESENT') ) return;
+				
+				if( dbg_ConstOn('DBG_SKIP_REPORTING') || dbg_ConstOn('DBG_ZEND_PRESENT')) return '';
 
 				if (defined('SPACER_URL')) {
 					$this->dummyImage = SPACER_URL;
 				}
-				dbg_safeDefine('DBG_RAISE_ON_WARNINGS',0);
+				dbg_safeDefine('DBG_RAISE_ON_WARNINGS', 0);
 
-				$this->memoryUsage['debugger_start']=memory_get_usage();
+				$this->memoryUsage['debugger_start'] = memory_get_usage();
 
 				// show php session if any
 				$this->appendSession();
 
 				// ensure, that 1st line of debug output always is this one:
-				$this->appendHTML('<a href="javascript:toggleDebugLayer(27);">Hide Debugger</a>');
+				$this->appendHTML('<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>');
 				$this->moveToBegin(1);
 
-				if( dbg_ConstOn('DBG_SQL_PROFILE') && isset($this->ProfilerTotals['sql']) )
-				{
+				if(dbg_ConstOn('DBG_SQL_PROFILE') && isset($this->ProfilerTotals['sql'])) {
 					$this->appendHTML('<b>SQL Total time:</b> '.$this->ProfilerTotals['sql'].' Number of queries: '.$this->ProfilerTotalCount['sql']);
 				}
 
-				if( dbg_ConstOn('DBG_PROFILE_INCLUDES') && isset($this->ProfilerTotals['includes']) )
-				{
+				if (dbg_ConstOn('DBG_PROFILE_INCLUDES') && isset($this->ProfilerTotals['includes'])) {
 					$this->appendHTML('<b>Included Files Total time:</b> '.$this->ProfilerTotals['includes'].' Number of includes: '.$this->ProfilerTotalCount['includes']);
 				}
 
-				if( dbg_ConstOn('DBG_PROFILE_MEMORY') )
-				{
+				if (dbg_ConstOn('DBG_PROFILE_MEMORY')) {
 					$this->appendHTML('<b>Memory used by Objects:</b> '.round($this->ProfilerTotals['objects']/1024, 2).'Kb');
 				}
 
@@ -748,204 +739,198 @@
 						</div>
 					</div>
 					<script language="javascript">
-
-						function dbg_OpenDOMViewer()
-						{
+						function Debugger() {
+							this.IsVisible = false;
+							this.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
+							this.EditorPath = '<?php echo defined('WINDOWS_EDITOR') ? addslashes(WINDOWS_EDITOR) : '' ?>';
+							this.DebuggerDIV = document.getElementById('debug_layer');
+							
+							window.onresize = this.Resize;
+							window.onscroll = this.Resize;
+						}
+						
+						document.onkeydown = function($e) {
+							var $KeyCode = $Debugger.GetKeyCode($e);
+							if ($KeyCode == 123 || $KeyCode == 27) {// F12 or ESC
+								$Debugger.Toggle($KeyCode);
+								$Debugger.StopEvent($e);
+							}
+						}
+					
+						Debugger.prototype.OpenDOMViewer = function() {
 							var $value = document.getElementById('dbg_domviewer').value;
 							DOMViewerObj = ($value.indexOf('"') != -1) ? document.getElementById( $value.substring(1,$value.length-1) ) : eval($value);
-							window.open('<?php echo constant('DBG_DOMVIEWER'); ?>');
+							window.open(this.DOMViewerURL);
 							return false;
 						}
 
-						function getEventKeyCode($e)
-						{
-							var $KeyCode = 0;
-							if($e.keyCode) $KeyCode = $e.keyCode;
-							else if($e.which) $KeyCode = $e.which;
-							return $KeyCode;
+						Debugger.prototype.GetKeyCode = function($e) {
+							$e = ($e) ? $e : event;
+							var target = ($e.target) ? $e.target : $e.scrElement;
+							var charCode = ($e.charCode) ? $e.charCode : (($e.which) ? $e.which : $e.keyCode);
+							return charCode;
 						}
 
-						function keyProcessor($e)
-						{
-							if(!$e) $e = window.event;
-							var $KeyCode = getEventKeyCode($e);
-							if($KeyCode==123||$KeyCode==27) // F12 or ESC
-							{
-								toggleDebugLayer($KeyCode);
-								$e.cancelBubble = true;
-								if($e.stopPropagation) $e.stopPropagation();
-							}
+						Debugger.prototype.StopEvent = function($e) {
+							$e = ($e) ? $e : event;
+							$e.cancelBubble = true;
+							if ($e.stopPropagation) $e.stopPropagation();
 						}
 
-						function toggleDebugLayer($KeyCode)
-						{
-							var $isVisible=false;
-							var $DebugLayer = document.getElementById('debug_layer');
-							if( typeof($DebugLayer) != 'undefined' )
-							{
-								$isVisible = ($DebugLayer.style.display == 'none')?false:true;
-								if(!$isVisible&&$KeyCode==27) return false;
-
-								resizeDebugLayer(null);
-								$DebugLayer.style.display = $isVisible?'none':'block';
+						Debugger.prototype.Toggle = function($KeyCode) {
+							if(!this.DebuggerDIV) return false;
+							
+							this.IsVisible = this.DebuggerDIV.style.display == 'none' ? false : true;
+							if (!this.IsVisible && $KeyCode == 27) {
+								return false;
 							}
-						}
 
-						function prepareSizes($Prefix)
-						{
-							var $ret = '';
-							$ret = eval('document.body.'+$Prefix+'Top')+'; ';
-							$ret += eval('document.body.'+$Prefix+'Left')+'; ';
-							$ret += eval('document.body.'+$Prefix+'Height')+'; ';
-							$ret += eval('document.body.'+$Prefix+'Width')+'; ';
-							return $ret;
+							this.Resize(null);
+							this.DebuggerDIV.style.display = this.IsVisible ? 'none' : 'block';
+							
+							<?php 
+								if ($this->IsFatalError) {
+									echo 'this.DebuggerDIV.scrollTop = 10000000;';
+								}
+							?>
 						}
 
-						function resizeDebugLayer($e)
-						{
-							if(!$e) $e = window.event;
-							var $DebugLayer = document.getElementById('debug_layer');
-							var $TopMargin = 1;
-
-							var $pageWidth = document.all ? document.body.offsetWidth - 4 : window.innerWidth;
-							var $pageHeight = document.all ? document.body.clientHeight : window.innerHeight; // document.body.offsetHeight - 2
-
+						Debugger.prototype.Resize = function($e) {
+							if (!this.DebuggerDIV) return false;
 							var $pageTop = document.all ? document.body.offsetTop + document.body.scrollTop : window.scrollY;
-
-							if( typeof($DebugLayer) != 'undefined' )
-							{
-								if(document.all)
-								{
-									$DebugLayer.style.top = ($pageTop + 2) + 'px';
-									$DebugLayer.style.height = ($pageHeight - 2 - 4) + 'px';
-								}
-								else
-								{
-									$DebugLayer.style.top = ($pageTop + 2) + 'px';
-									$DebugLayer.style.height = ($pageHeight - 2 - 15) + 'px';
-								}
-							}
-//							window.parent.status = 'OFFSET: '+prepareSizes('offset')+' | SCROLL: '+prepareSizes('scroll')+' | CLIENT: '+prepareSizes('client');
-//							window.parent.status += 'DL Info: '+$DebugLayer.style.top+'; S.AH: '+screen.availHeight;
+							
+							this.DebuggerDIV.style.top = $pageTop + 'px';
+							this.DebuggerDIV.style.height = GetWindowHeight() + 'px';
 							return true;
 						}
 
-						function SetClipboard(copyText)
-						{
-							if(window.clipboardData)
-							{
+						function GetWindowHeight() {
+							var currWinHeight;
+							if (window.innerHeight) {//FireFox with correction for status bar at bottom of window
+								currWinHeight = window.innerHeight - 10;
+							} else if (document.documentElement.clientHeight) {//IE 7 with correction for address bar
+								currWinHeight = document.documentElement.clientHeight - 10;
+							} else if (document.body.offsetHeight) {//IE 4+
+								currWinHeight = document.body.offsetHeight - 5 + 15 - 10; // + 10
+							}
+							return currWinHeight;
+						}
+						
+						
+						/*function GetWinHeight() {
+							if (window.innerHeight) return window.innerHeight;
+							else if (document.documentElement.clientHeight) return document.documentElement.clientHeight;
+							else if (document.body.offsetHeight) return document.body.offsetHeight;
+							else return _winHeight;
+						}*/
+						
+						Debugger.prototype.SetClipboard = function(copyText) {
+							if (window.clipboardData) {
 								// IE send-to-clipboard method.
 								window.clipboardData.setData('Text', copyText);
 							}
-							else if (window.netscape)
-							{
+							else if (window.netscape) {
 								// You have to sign the code to enable this or allow the action in about:config by changing user_pref("signed.applets.codebase_principal_support", true);
 								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
 								// Store support string in an object.
-								var str = Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString);
-								if (!str) return false;
-								str.data=copyText;
+								var str = Components.classes['@mozilla.org/supports-string;1'].createInstance(Components.interfaces.nsISupportsString);
+								if (!str) {
+									return false;
+								}
+								str.data = copyText;
 
 								// Make transferable.
-								var trans = Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
-								if (!trans) return false;
+								var trans = Components.classes['@mozilla.org/widget/transferable;1'].createInstance(Components.interfaces.nsITransferable);
+								if (!trans) {
+									return false;
+								}
 
 								// Specify what datatypes we want to obtain, which is text in this case.
-								trans.addDataFlavor("text/unicode");
-								trans.setTransferData("text/unicode",str,copyText.length*2);
+								trans.addDataFlavor('text/unicode');
+								trans.setTransferData('text/unicode', str, copyText.length * 2);
 
-								var clipid=Components.interfaces.nsIClipboard;
-								var clip = Components.classes["@mozilla.org/widget/clipboard;1"].getService(clipid);
-								if (!clip) return false;
+								var clipid = Components.interfaces.nsIClipboard;
+								var clip = Components.classes['@mozilla.org/widget/clipboard;1'].getService(clipid);
+								if (!clip) {
+									return false;
+								}
 
-								clip.setData(trans,null,clipid.kGlobalClipboard);
+								clip.setData(trans, null, clipid.kGlobalClipboard);
 							}
-
 						}
 
-						function showProps($Obj, $Name)
-						{
+						Debugger.prototype.ShowProps = function($Obj, $Name) {
 							var $ret = '';
-							for($Prop in $Obj)
-							{
-								$ret += $Name+'.'+$Prop+' = '+$Obj[$Prop]+"\n";
+							for ($Prop in $Obj) {
+								$ret += $Name + '.' + $Prop + ' = ' + $Obj[$Prop] + "\n";
 							}
-							return $ret;
+							return alert($ret);
 						}
 
-						function editFile($fileName,$lineNo)
-						{
-							if(!document.all)
-							{
+						Debugger.prototype.editFile = function($fileName, $lineNo) {
+							if (!document.all) {
 								alert('Only works in IE');
 								return;
 							}
 
-							var $editorPath = '<?php echo defined('WINDOWS_EDITOR') ? addslashes(WINDOWS_EDITOR) : '' ?>';
-							if($editorPath)
-							{
-								var $obj = new ActiveXObject("LaunchinIE.Launch");
-								$editorPath = $editorPath.replace('%F',$fileName);
-								$editorPath = $editorPath.replace('%L',$lineNo);
-								$obj.LaunchApplication($editorPath);
-							}
-							else
-							{
+							if (!this.EditorPath) {
 								alert('Editor path not defined!');
+								return;
 							}
+							
+							var $launch_object = new ActiveXObject('LaunchinIE.Launch');
+							var $editor_path = this.EditorPath;
+							$editor_path = $editor_path.replace('%F', $fileName);
+							$editor_path = $editor_path.replace('%L',$lineNo);
+							$launch_object.LaunchApplication($editor_path);
 						}
 
-						function toggleTraceArgs($ArgsLayerID)
-						{
-							var $ArgsLayer = document.getElementById($ArgsLayerID);
-							$ArgsLayer.style.display = ($ArgsLayer.style.display == 'none') ? 'block' : 'none';
+						Debugger.prototype.ToggleTraceArgs = function($arguments_layer_id) {
+							var $arguments_layer = document.getElementById($arguments_layer_id);
+							$arguments_layer.style.display = ($arguments_layer.style.display == 'none') ? 'block' : 'none';
 						}
-
-
-						document.onkeydown = keyProcessor;
-						window.onresize = resizeDebugLayer;
-						window.onscroll = resizeDebugLayer;
+						
+						$Debugger = new Debugger();
+						<?php
+							if ($this->IsFatalError || DBG_RAISE_ON_WARNINGS) { 
+								echo '$Debugger.Toggle();';
+							}
+						?>
 						window.focus();
-						if( typeof($isFatalError) != 'undefined' && $isFatalError == 1 || <?php echo DBG_RAISE_ON_WARNINGS; ?> )
-						{
-							toggleDebugLayer();
-						}
-						if( typeof($isFatalError) != 'undefined' && $isFatalError == 1)
-						{
-							document.getElementById('debug_layer').scrollTop = 10000000;
-						}
 					</script>
 				<?php
 
 					dbg_safeDefine('DBG_SHOW_MEMORY_USAGE', 1);
-					if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') )
-					{
-						$this->memoryUsage['debugger_finish']=memory_get_usage();
-						$this->memoryUsage['print_report']=$this->memoryUsage['debugger_finish']-$this->memoryUsage['debugger_start'];
-						$this->memoryUsage['total']=$this->memoryUsage['print_report']+$this->memoryUsage['error_handling'];
-						$this->memoryUsage['application']=memory_get_usage()-$this->memoryUsage['total'];
+					if(dbg_ConstOn('DBG_SHOW_MEMORY_USAGE')) {
+						$this->memoryUsage['debugger_finish']	=	memory_get_usage();
+						$this->memoryUsage['print_report']		=	$this->memoryUsage['debugger_finish']-$this->memoryUsage['debugger_start'];
+						$this->memoryUsage['total']				=	$this->memoryUsage['print_report']+$this->memoryUsage['error_handling'];
+						$this->memoryUsage['application']		=	memory_get_usage() - $this->memoryUsage['total'];
 					}
 
-					if($returnResult)
-					{
+					if ($returnResult) {
 						$ret = ob_get_contents();
-						if($clean_output_buffer) ob_clean();
-						if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) $ret .= $this->getMemoryUsageReport();
+						if ($clean_output_buffer) {
+							ob_clean();
+						}
+						if (dbg_ConstOn('DBG_SHOW_MEMORY_USAGE')) {
+							$ret .= $this->getMemoryUsageReport();
+						}
 						$this->reportDone = true;
 						return $ret;
 					}
-					else
-					{
-						if( !dbg_ConstOn('DBG_HIDE_FULL_REPORT') )
-						{
+					else {
+						if (!dbg_ConstOn('DBG_HIDE_FULL_REPORT')) {
 							$this->breakOutofBuffering();
 						}
-						else
-						{
-							if($clean_output_buffer) ob_clean();
+						elseif ($clean_output_buffer) {
+							ob_clean();
 						}
-						if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) echo $this->getMemoryUsageReport();
+						
+						if (dbg_ConstOn('DBG_SHOW_MEMORY_USAGE')) {
+							echo $this->getMemoryUsageReport();
+						}
 						$this->reportDone = true;
 					}
 			}
@@ -988,11 +973,10 @@
 			function saveError($errno, $errstr, $errfile = '', $errline = '', $errcontext = '')
 			{
 				$memory_used=Array();
-				$memory_used['begin']=memory_get_usage();
+				$memory_used['begin'] = memory_get_usage();
 
 				$errorType = $this->getErrorNameByCode($errno);
-				if(!$errorType)
-				{
+				if (!$errorType) {
 					trigger_error('Unknown error type ['.$errno.']', E_USER_ERROR);
 					return false;
 				}
@@ -1006,54 +990,39 @@
 					unset($this->longErrors[$long_id]);
 				}
 
-
-				/*in /www/kostja/in-commerce4/kernel/kernel4/parser/construct_tags.php(177) : runtime-created function on line
-
-				[PRE-PARSED block, $line 13]: Undefined variable: IdField*/
-				/*
-				if( strpos($errfile,'runtime-created') !== false ) {
-					$errfile = ' PRE-PARSED block <b>'.$this->CurrentPreParsedBlock.'</b> ';
-				}*/
-
-				if( strpos($errfile,'eval()\'d code') !== false )
-				{
+				if (strpos($errfile,'eval()\'d code') !== false) {
 					$errstr = '[<b>EVAL</b>, line <b>'.$errline.'</b>]: '.$errstr;
 					$tmpStr = $errfile;
 					$pos = strpos($tmpStr,'(');
 					$errfile = substr($tmpStr,0,$pos);
 					$pos++;
 					$errline = substr($tmpStr,$pos,strpos($tmpStr,')',$pos)-$pos);
 				}
-				// if($this->TraceNextError || $errno == E_USER_ERROR)
-				if($this->TraceNextError)
-				{
-					$this->appendTrace();
-					$this->TraceNextError=false;
-				}
+				
 				$this->Data[] = Array('no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline, 'context' => $errcontext, 'debug_type' => 'error');
 				$memory_used['end']=memory_get_usage();
 				$this->memoryUsage['error_handling']+=$memory_used['end']-$memory_used['begin'];
-				if( substr($errorType,0,5) == 'Fatal')
-				{
+				if (substr($errorType,0,5) == 'Fatal') {
 					$this->breakOutofBuffering(false);
-					echo '<script language="javascript">var $isFatalError = 1;</script>';
+					$this->IsFatalError = true;
 					ob_flush();
-					if( !dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC') ) $this->printReport();
+					if (!dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC')) {
+						$this->printReport();
+					}
 					exit;
 				}
 			}
+			
 			function breakOutofBuffering($flush = true)
 			{
-				while (ob_get_level())
-				{
+				while (ob_get_level()) {
 					if ($flush) {
 						ob_end_flush();
 					}
 					else {
 						ob_end_clean();
 					}
 				}
-				//ob_end_flush();
 			}
 
 			function saveToFile($msg)
@@ -1107,33 +1076,30 @@
 			}
 
 			function AttachToApplication() {
-				if( dbg_ConstOn('DBG_HANDLE_ERRORS') )
-				{
-					if( class_exists('kApplication') )
-					{
-						restore_error_handler();
-						$application =& kApplication::Instance();
-						$application->Debugger =& $this;
-						$application->errorHandlers[] = Array(&$this, 'saveError');
-					}
-					else
-					{
-						set_error_handler( Array(&$this, 'saveError')  );
-					}
+				if (!dbg_ConstOn('DBG_HANDLE_ERRORS')) return true;
+				
+				if (class_exists('kApplication')) {
+					restore_error_handler();
+					$application =& kApplication::Instance();
+					$application->Debugger =& $this;
+					$application->errorHandlers[] = Array(&$this, 'saveError');
 				}
+				else {
+					set_error_handler( Array(&$this, 'saveError') );
+				}
 			}
 		}
 
-		if( !function_exists('memory_get_usage') )
-		{
+		if (!function_exists('memory_get_usage')) {
 			function memory_get_usage(){ return -1;	}
 		}
 
-		if( !dbg_ConstOn('DBG_ZEND_PRESENT') )
-		{
+		if(!dbg_ConstOn('DBG_ZEND_PRESENT')) {
 			$debugger = new Debugger();
 		}
 
-		if( dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC') ) register_shutdown_function( Array(&$debugger, 'printReport') );
+		if (dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC')) {
+			register_shutdown_function( Array(&$debugger, 'printReport') );
+		}
 	}
 ?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/header.tpl
===================================================================
diff -u -r4785 -r4814
--- trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 4785)
+++ trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 4814)
@@ -46,6 +46,6 @@
 <inp2:m_ParseBlock name="kernel_form"/>
 <inp2:m_if check="m_IsDebugMode">
 	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
-		<input type="button" class="button" value="Reload Frame" onclick="self.location.reload();" />&nbsp;&nbsp;<input type="button" class="button" value="Show Debugger" onclick="toggleDebugLayer();" />
+		<input type="button" class="button" value="Reload Frame" onclick="self.location.reload();" />&nbsp;&nbsp;<input type="button" class="button" value="Show Debugger" onclick="$Debugger.Toggle();" />
 	</inp2:m_if>
 </inp2:m_if>
\ No newline at end of file
Index: trunk/kernel/include/adodb/adodb.inc.php
===================================================================
diff -u -r3576 -r4814
--- trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 3576)
+++ trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 4814)
@@ -760,7 +760,7 @@
 					$debugger->dumpVars($_REQUEST);
 					$debugger->appendTrace();
 					
-					$error_msg = '<span class="debug_error">'.$m.' ('.$e.')</span><br><a href="javascript:SetClipboard(\''.htmlspecialchars($sql).'\');"><b>SQL</b></a>: '.$debugger->formatSQL($sql);
+					$error_msg = '<span class="debug_error">'.$m.' ('.$e.')</span><br><a href="javascript:$Debugger.SetClipboard(\''.htmlspecialchars($sql).'\');"><b>SQL</b></a>: '.$debugger->formatSQL($sql);
 					$long_id=$debugger->mapLongError($error_msg);
 					trigger_error( substr($m.' ('.$e.') ['.$sql.']',0,1000).' #'.$long_id, $errorLevel);
 					
Index: trunk/kernel/action.php
===================================================================
diff -u -r4803 -r4814
--- trunk/kernel/action.php	(.../action.php)	(revision 4803)
+++ trunk/kernel/action.php	(.../action.php)	(revision 4814)
@@ -1378,7 +1378,7 @@
 
 //       $img->debuglevel=1;
 
-	   $img->Pending=false;
+	   $img->Pending = true;
        if($LocalImage)
        {
            $file = $_FILES["imgFullFile"];