Index: branches/5.3.x/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r15911 -r15948
--- branches/5.3.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 15911)
+++ branches/5.3.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 15948)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 15911 2013-07-23 14:21:17Z alex $
+* @version	$Id: debugger.php 15948 2013-08-23 14:49:22Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -200,6 +200,16 @@
 		 */
 		class Debugger {
 
+			const ROW_TYPE_ERROR = 'error';
+
+			const ROW_TYPE_WARNING = 'warning';
+
+			const ROW_TYPE_NOTICE = 'notice';
+
+			const ROW_TYPE_SQL = 'sql';
+
+			const ROW_TYPE_OTHER = 'other';
+
 			/**
 			 * Holds reference to global KernelApplication instance
 			 *
@@ -224,6 +234,8 @@
 			 */
 			private $_lastErrorProcessed = false;
 
+			private $_filterTypes = Array ('error', 'warning', 'notice', 'sql', 'other');
+
 			/**
 			 * Counts warnings on the page
 			 *
@@ -671,6 +683,48 @@
 			}
 
 			/**
+			 * Returns row type for debugger row.
+			 *
+			 * @param integer $data_index Index of the row.
+			 *
+			 * @return string
+			 */
+			protected function getRowType($data_index)
+			{
+				$data = $this->Data[$data_index];
+
+				switch ($data['debug_type']) {
+					case 'html':
+						if ( strpos($data['html'], 'SQL Total time') !== false ) {
+							return self::ROW_TYPE_SQL;
+						}
+						break;
+
+					case 'error':
+						$error_map = array(
+							'Fatal Error' => self::ROW_TYPE_ERROR,
+							'Warning' => self::ROW_TYPE_WARNING,
+							'Notice' => self::ROW_TYPE_NOTICE,
+						);
+
+						return $error_map[$this->getErrorNameByCode($data['no'])];
+						break;
+
+					case 'exception':
+						return self::ROW_TYPE_ERROR;
+						break;
+
+					case 'profiler':
+						if ( preg_match('/^sql_/', $data['profile_key']) ) {
+							return self::ROW_TYPE_SQL;
+						}
+						break;
+				}
+
+				return self::ROW_TYPE_OTHER;
+			}
+
+			/**
 			 * Returns debugger report window width excluding scrollbar
 			 *
 			 * @return int
@@ -1468,7 +1522,7 @@
 				$this->appendSession(); // show php session if any
 
 				// ensure, that 1st line of debug output always is this one:
-				$top_line = '<table cellspacing="0" cellpadding="0" style="width: ' . $this->getWindowWidth() . 'px; margin: 0px;"><tr><td align="left" width="50%">[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>] [<a href="javascript:$Debugger.Clear();">Clear Debugger</a>]</td><td align="right" width="50%">[Current Time: <b>' . date('H:i:s') . '</b>] [File Size: <b>#DBG_FILESIZE#</b>]</td></tr></table>';
+				$top_line = '<table cellspacing="0" cellpadding="0" style="width: ' . $this->getWindowWidth() . 'px; margin: 0px;"><tr><td align="left" width="50%">[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>] [<a href="javascript:$Debugger.Clear();">Clear Debugger</a>]</td><td align="right" width="50%">[Current Time: <b>' . date('H:i:s') . '</b>] [File Size: <b>#DBG_FILESIZE#</b>]</td></tr><tr><td align="left" colspan="2" style="padding-top: 5px;">' . $this->getFilterDropdown() . '</td></tr></table>';
 
 				$this->appendHTML($top_line);
 				$this->moveToBegin(1);
@@ -1552,7 +1606,10 @@
 					$lineCount = count($this->Data);
 
 					while ( $i < $lineCount ) {
-						fwrite($fp, $this->prepareHTML($i) . $this->rowSeparator);
+						$html = $this->prepareHTML($i);
+						$row_type = $this->getRowType($i);
+
+						fwrite($fp, json_encode(Array ('html' => $html, 'row_type' => $row_type)) . $this->rowSeparator);
 						$i++;
 					}
 
@@ -1569,6 +1626,7 @@
 				$dbg_path = str_replace(FULL_PATH, '', $this->tempFolder);
 
 				$debugger_params = Array (
+					'FilterTypes' => $this->_filterTypes,
 					'RowSeparator' => $this->rowSeparator,
 					'ErrorsCount' => (int)$this->getProfilerTotal('error_handling'),
 					'IsFatalError' => $this->IsFatalError,
@@ -1634,6 +1692,17 @@
 				return '';
 			}
 
+			function getFilterDropdown()
+			{
+				$filter_options = '';
+
+				foreach ( $this->_filterTypes as $filter_type ) {
+					$filter_options .= '<option value="' . $filter_type . '">' . $filter_type . '</option>';
+				}
+
+				return 'Show: <select id="dbg_filter" onchange="$Debugger.Filter()"><option value="">All</option>' . $filter_options .'</select>';
+			}
+
 			function getMemoryUsed($debugger_start)
 			{
 				if ( !isset($this->ProfilerTotals['error_handling']) ) {