Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r4819 -r4821
--- trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4819)
+++ trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4821)
@@ -96,10 +96,32 @@
 			var $reportDone = false;
 
 			var $dummyImage = '';
-
+			
+			/**
+			 * Folder for holding AJAX temporary file
+			 *
+			 * @var string
+			 */
+			var $tempFolder = '';
+			
+			/**
+			 * Debug rows will be separated using this string before writing to debug file
+			 *
+			 * @var string
+			 */
+			var $rowSeparator = '@@';
+			
+			/**
+			 * Base URL for debugger includes
+			 *
+			 * @var string
+			 */
+			var $baseURL = '';
+					
 			function Debugger()
 			{
 				$this->dummyImage = PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').'/'.'kernel/admin_templates/img/spacer.gif';
+				$this->tempFolder = FULL_PATH.'/kernel/cache';
 				
 				global $start;
 				$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
@@ -112,6 +134,18 @@
 				$this->appendRequest();
 			}
 
+			function InitReport()
+			{
+				if (!class_exists('kApplication')) return false;
+				
+				$application =& kApplication::Instance();
+				$this->rowSeparator = '@'.$application->GetSID().'@';
+				
+				$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
+				$kernel_path = preg_replace($reg_exp, '', KERNEL_PATH, 1);
+				$this->baseURL = PROTOCOL.SERVER_NAME.rtrim(BASE_PATH, '/').$kernel_path.'/utility/debugger';
+			}
+			
 			function mapLongError($msg)
 			{
 				$key = $this->generateID();
@@ -572,7 +606,7 @@
 						break;
 				}
 			}
-
+			
 			/**
 			 * Generates report
 			 *
@@ -588,6 +622,9 @@
 				if (defined('SPACER_URL')) {
 					$this->dummyImage = SPACER_URL;
 				}
+				
+				$this->InitReport();
+				
 				dbg_safeDefine('DBG_RAISE_ON_WARNINGS', 0);
 
 				$this->memoryUsage['debugger_start'] = memory_get_usage();
@@ -610,7 +647,7 @@
 				if (dbg_ConstOn('DBG_PROFILE_MEMORY')) {
 					$this->appendHTML('<b>Memory used by Objects:</b> '.round($this->ProfilerTotals['objects']/1024, 2).'Kb');
 				}
-
+				
 				/*if( dbg_ConstOn('DBG_INCLUDED_FILES') )
 				{
 					$files = get_included_files();
@@ -647,268 +684,40 @@
 					}
 				}*/
 
+				
+				$i = 0;
+				$lineCount = count($this->Data);
+				
+				$debug_file = $this->tempFolder.'/debug_'.$this->rowSeparator.'.txt';
+				if (file_exists($debug_file)) unlink($debug_file);
+				
+				$fp = fopen($debug_file, 'a');
+				while ($i < $lineCount) {
+					fwrite($fp, $this->prepareHTML($i).$this->rowSeparator);
+					$i++;
+				}
+				fclose($fp);
+									
+									
 				ob_start();
-				?>
-					<style type="text/css">
-
-						.dbg_profiler {
-							margin-top: 5px;
-							padding: 0px;
-							height: 10px;
-							border: 1px solid #000000;
-							float: left;
-							display: inline;
-						}
-
-						.dbg_flat_table {
-							border-collapse: collapse;
-							width: auto;
-							margin: 0px;
-						}
-
-						.dbg_flat_table TD {
-							border: 1px solid #CCCCCC;
-							padding: 4px;
-						}
-
-						.debug_layer_table {
-							border-collapse: collapse;
-							width: <?php echo $this->getWindowWidth(); ?>px;
-						}
-
-						.debug_text, .debug_row_even TD, .debug_row_odd TD {
-							color: #000000;
-							font-family: Verdana;
-							font-size: 11px;
-							word-wrap: break-word;
-						}
-
-						.debug_cell {
-							border: 1px solid #FF0000;
-							padding: 4px;
-							word-wrap: break-word;
-							text-align: left;
-						}
-
-						.debug_row_even {
-							background-color: #CCCCFF;
-						}
-
-						.debug_row_odd {
-							background-color: #FFFFCC;
-						}
-
-						.debug_layer_container {
-							left: 2px;
-							top: 1px;
-							width: <?php echo DBG_WINDOW_WIDTH; ?>px;
-							z-index: +1000;
-							position: absolute;
-							overflow: auto;
-							border: 2px solid;
-							padding: 3px;
-							border-top-color: threedlightshadow;
-							border-left-color: threedlightshadow;
-							border-right-color: threeddarkshadow;
-							border-bottom-color: threeddarkshadow;
-							background-color: buttonface;
-						}
-
-						.debug_layer {
-							padding: 0px;
-							width: <?php echo $this->getWindowWidth(); ?>px;
-						}
-
-						.debug_error {
-							color: #FF0000;
-						}
-					</style>
-					<div id="debug_layer" class="debug_layer_container" style="display: none;">
-						<div class="debug_layer">
-							<table width="100%" cellpadding="0" cellspacing="1" border="0" class="debug_layer_table" align="left">
-								<tbody id="debug_table">
-									<?php
-										$i = 0;
-										$lineCount = count($this->Data);
-										while ($i < $lineCount) {
-											echo '<tr id="debug_row_'.($i+1).'" class="debug_row_'.(($i % 2) ? 'odd' : 'even').'"><td class="debug_cell">'.$this->prepareHTML($i).'</td></tr>';
-											$i++;
-										}
-									?>
-								</tbody>
+			?>
+					<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js"></script>
+					<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" />
+					<div id="debug_layer" class="debug_layer_container" style="display: none; width: <?php echo DBG_WINDOW_WIDTH; ?>px;">
+						<div class="debug_layer" style="width: <?php echo $this->getWindowWidth(); ?>px;">
+							<table width="100%" cellpadding="0" cellspacing="1" border="0" class="debug_layer_table" style="width: <?php echo $this->getWindowWidth(); ?>px;" align="left">
+								<tbody id="debug_table"></tbody>
 							</table>
 						</div>
 					</div>
-					<script language="javascript">
-						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');
-							this.DebuggerTable = document.getElementById('debug_table');
-							this.RowCount = <?php echo $lineCount; ?>;
-							
-//							window.$Debugger = this; // this should be uncommented in case if debugger variable is not $Debugger
-							window.onscroll = function(ev) { window.$Debugger.Resize(ev); }
-							window.onresize = function(ev) { window.$Debugger.Resize(ev); }
-							document.onkeydown = function(ev) { window.$Debugger.KeyDown(ev); }
-						}
-						
-						Debugger.prototype.AppendRow = function($html) {
-							this.RowCount++;
-							var $tr = document.createElement('TR');
-							this.DebuggerTable.appendChild($tr);
-							$tr.className = 'debug_row_' + (this.RowCount % 2 ? 'odd' : 'even');
-							$tr.id = 'debug_row_' + this.RowCount;
-							var	$td = document.createElement('TD');
-							$tr.appendChild($td);
-							$td.className = 'debug_cell';
-							$td.innerHTML = $html;
-						}
-						
-						Debugger.prototype.KeyDown = function($e) {
-							var $KeyCode = this.GetKeyCode($e);
-							if ($KeyCode == 123 || $KeyCode == 27) {// F12 or ESC
-								this.Toggle($KeyCode);
-								this.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(this.DOMViewerURL);
-							return false;
-						}
-
-						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;
-						}
-
-						Debugger.prototype.StopEvent = function($e) {
-							$e = ($e) ? $e : event;
-							$e.cancelBubble = true;
-							if ($e.stopPropagation) $e.stopPropagation();
-						}
-
-						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;
-							}
-
-							this.Resize(null);
-							this.DebuggerDIV.style.display = this.IsVisible ? 'none' : 'block';
-							
-							<?php 
-								if ($this->IsFatalError) {
-									echo 'this.DebuggerDIV.scrollTop = 10000000;';
-								}
-							?>
-						}
-
-						Debugger.prototype.Resize = function($e) {
-							if (!this.DebuggerDIV) return false;
-							var $pageTop = document.all ? document.body.offsetTop + document.body.scrollTop : window.scrollY;
-							
-							this.DebuggerDIV.style.top = $pageTop + 'px';
-							this.DebuggerDIV.style.height = GetWindowHeight() + 'px';
-							return true;
-						}
-
-						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) {
-								// 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;
-
-								// Make transferable.
-								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);
-
-								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);
-							}
-						}
-
-						Debugger.prototype.ShowProps = function($Obj, $Name) {
-							var $ret = '';
-							for ($Prop in $Obj) {
-								$ret += $Name + '.' + $Prop + ' = ' + $Obj[$Prop] + "\n";
-							}
-							return alert($ret);
-						}
-
-						Debugger.prototype.editFile = function($fileName, $lineNo) {
-							if (!document.all) {
-								alert('Only works in IE');
-								return;
-							}
-
-							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);
-						}
-
-						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';
-						}
-						
+					<script type="text/javascript">
 						var $Debugger = new Debugger();
+						$Debugger.IsFatalError = <?php echo $this->IsFatalError ? 'true' : 'false'; ?>;
+						$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
+						$Debugger.EditorPath = '<?php echo defined('WINDOWS_EDITOR') ? addslashes(WINDOWS_EDITOR) : '' ?>';
+						$Debugger.RowSeparator = '<?php echo $this->rowSeparator; ?>';
+						$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator; ?>';
 						<?php
 							if ($this->IsFatalError || DBG_RAISE_ON_WARNINGS) { 
 								echo '$Debugger.Toggle();';
@@ -962,19 +771,22 @@
 			{
 				if( !dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) return '';
 
-				$info = Array('<a href="javascript:self.location.reload()">printReport</a>'=>'print_report',
-							'saveError'=>'error_handling',
-							'Total'=>'total',
-							'Application'=>'application');
-				$ret=Array();
-				foreach($info as $title => $value_key)
-				{
-					$ret[]='<tr><td>'.$title.':</td><td><b>'.$this->formatSize($this->memoryUsage[$value_key]).'</b></td></tr>';
+				$info = Array(
+								'printReport'	=>	'print_report',
+								'saveError'		=>	'error_handling',
+								'Total'			=>	'total',
+								'Application'	=>	'application'
+						);
+						
+				$ret = '<table class="dbg_flat_table">';
+				foreach ($info as $title => $value_key) {
+					$ret .= '<tr><td>'.$title.':</td><td><b>'.$this->formatSize($this->memoryUsage[$value_key]).'</b></td></tr>';
 				}
+				
 				$Data =& $this->ProfilerData['script_runtime'];
 				$runtime = ($Data['ends'] - $Data['begins']); // in seconds
-				$ret[] = '<tr><td>Script runtime:</td><td>'.sprintf('%.5f', $runtime).'</td></tr>';
-				return '<table class="dbg_flat_table">'.implode('',$ret).'</table>';
+				$ret .= '<tr><td>Script runtime:</td><td>'.sprintf('%.5f', $runtime).'</td></tr></table>';
+				return $ret;
 			}
 
 
@@ -989,7 +801,7 @@
 			 */
 			function saveError($errno, $errstr, $errfile = '', $errline = '', $errcontext = '')
 			{
-				$memory_used=Array();
+				$memory_used = Array();
 				$memory_used['begin'] = memory_get_usage();
 
 				$errorType = $this->getErrorNameByCode($errno);
@@ -1003,22 +815,22 @@
 				if (preg_match('/(.*)#([\d]+)$/', $errstr, $rets) ) {
 					// replace short message with long one (due triger_error limitations on message size)
 					$long_id = $rets[2];
-					$errstr=$this->longErrors[$long_id];
+					$errstr = $this->longErrors[$long_id];
 					unset($this->longErrors[$long_id]);
 				}
 
 				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);
+					$errfile = substr($tmpStr, 0, $pos);
 					$pos++;
 					$errline = substr($tmpStr,$pos,strpos($tmpStr,')',$pos)-$pos);
 				}
 				
 				$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'];
+				$memory_used['end'] = memory_get_usage();
+				$this->memoryUsage['error_handling'] += $memory_used['end'] - $memory_used['begin'];
 				if (substr($errorType,0,5) == 'Fatal') {
 					$this->breakOutofBuffering(false);
 					$this->IsFatalError = true;