Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r1291 -r1314
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 1291)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 1314)
@@ -34,22 +34,22 @@
 							'DBG_SHOW_MEMORY_USAGE'=>1,
 							'DBG_IGNORE_STRICT_ERRORS'=>1,
 							'DOC_ROOT'=>$_SERVER['DOCUMENT_ROOT'],
-							'WINDOWS_ROOT'=>'w:');
+							'DBG_LOCAL_BASE_PATH'=>'w:');
 		
 		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
-		if(!defined('WINDOWS_EDITOR'))
+		/*if(!defined('WINDOWS_EDITOR'))
 		{
 			$dbg_editor = 0;
 			$dbg_editors[0] = Array('editor' => 'c:\Program Files\UltraEdit\uedit32.exe', 'params' => '%F/%L');
 			$dbg_editors[1] = Array('editor' => 'c:\Program Files\Zend\ZendStudio-4.0Beta\bin\ZDE.exe', 'params' => '%F');
 			define('WINDOWS_EDITOR',$dbg_editors[$dbg_editor]['editor'].' '.$dbg_editors[$dbg_editor]['params']);
 			unset($dbg_editors,$dbg_editor);
-		}
+		}*/
 	
 		class Debugger 
 		{
@@ -151,8 +151,7 @@
 						break;
 					
 					case 'var_dump':
-						$ret = $this->highlightString( print_r($Data['value'], true) );
-						return addslashes($ret);
+						return $this->highlightString( print_r($Data['value'], true) );
 						break;
 						
 					case 'trace':
@@ -257,7 +256,7 @@
 			
 			function highlightString($string)
 			{
-				if( defined('DBG_USE_HIGHLIGHT')&&DBG_USE_HIGHLIGHT )
+				if( dbg_ConstOn('DBG_USE_HIGHLIGHT') )
 				{
 					$string = highlight_string('<?php '.$string.'?>', true);
 					return preg_replace('/&lt;\?(.*)php (.*)\?&gt;/s','$2',$string);
@@ -285,7 +284,7 @@
 			
 			function getLocalFile($remoteFile)
 			{
-				return str_replace(DOC_ROOT, WINDOWS_ROOT, $remoteFile);	
+				return str_replace(DOC_ROOT, DBG_LOCAL_BASE_PATH, $remoteFile);	
 			}
 			
 			function appendTrace()
@@ -343,13 +342,20 @@
 				$this->Data = array_merge($lines,$this->Data);
 			}
 			
+			function moveAfterRow($new_row, $debugLineCount)
+			{
+				$lines = array_splice($this->Data,count($this->Data)-$debugLineCount,$debugLineCount);
+				$rows_before = array_splice($this->Data,0,$new_row,$lines);
+				$this->Data = array_merge($rows_before,$this->Data);
+			}
+			
 			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">
+				<table width="100%" border="0" cellspacing="0" cellpadding="4" class="dbg_flat_table">
 					<thead style="font-weight: bold;">
 						<td width="20">Src</td><td>Name</td><td>Value</td>
 					</thead>
@@ -468,10 +474,13 @@
 				ob_start();
 				?>
 					<style type="text/css">
-						.flat_table TD {
-							border: 1px solid buttonface;
-							border-width: 1 1 0 0;
+				
+						.dbg_flat_table {
+							border-collapse: collapse;
+						}
 						
+						.dbg_flat_table TD {
+							border: 1px solid buttonface;
 						}
 						
 						.debug_layer_table {
@@ -714,13 +723,13 @@
 				$info=Array('<a href="javascript:self.location.reload()">printReport</a>'=>'print_report',
 							'saveError'=>'error_handling',
 							'Total'=>'total',
-							'<u>Application</u>'=>'application');
+							'Application'=>'application');
 				$ret=Array();
 				foreach($info as $title => $value_key)
 				{
-					$ret[]=$title.': <b>'.$this->formatSize($this->memoryUsage[$value_key]).'</b>';
+					$ret[]='<tr><td>'.$title.':</td><td><b>'.$this->formatSize($this->memoryUsage[$value_key]).'</b></td></tr>';
 				}
-				return implode('<br>',$ret);
+				return '<table class="dbg_flat_table">'.implode('',$ret).'</table>';
 			}