In-Portal Issue Tracker

Index: admin_templates/tools/compile_complete.tpl
===================================================================
--- admin_templates/tools/compile_complete.tpl	(revision 15359)
+++ admin_templates/tools/compile_complete.tpl	(working copy)
@@ -41,7 +41,13 @@
 			<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 				<td><inp2:m_Param name="file"/></td>
 				<td><inp2:m_Param name="line"/></td>
-				<td><inp2:m_Param name="message"/></td>
+				<td>
+					<inp2:m_ifnot check="adm_IsParserException" class="$exception_class">
+						<strong><inp2:m_Param name="exception_class"/></strong>:
+					</inp2:m_ifnot>
+
+					<inp2:m_Param name="message" html_escape="1"/>
+				</td>
 			</tr>
 		</inp2:m_DefineElement>
 
Index: kernel/nparser/compiler.php
===================================================================
--- kernel/nparser/compiler.php	(revision 15359)
+++ kernel/nparser/compiler.php	(working copy)
@@ -51,8 +51,8 @@
 
 			try {
 				$this->Application->Parser->CheckTemplate($a_template['module'] . '/' . $a_template['path']);
-			} catch ( ParserException $e ) {
-				$this->Errors[] = Array ('msg' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine());
+			} catch ( Exception $e ) {
+				$this->Errors[] = Array ('message' => $e->getMessage(), 'exception_class' => get_class($e), 'file' => $e->getFile(), 'line' => $e->getLine());
 			}
 
 			$i++;
Index: kernel/utility/factory.php
===================================================================
--- kernel/utility/factory.php	(revision 15359)
+++ kernel/utility/factory.php	(working copy)
@@ -69,7 +69,7 @@
 	 *
 	 * @param string $class_name
 	 * @return void
-	 * @throws Exception
+	 * @throws kFactoryException
 	 * @access public
 	 */
 	public function autoload($class_name)
@@ -80,7 +80,7 @@
 		}
 
 		if ( !file_exists(FULL_PATH . $this->Files[$class_name]) ) {
-			throw new Exception('File <strong>' . FULL_PATH . $this->Files[$class_name] . '</strong> containing class <strong>' . $class_name . '</strong> definition not found');
+			throw new kFactoryException('File <strong>' . FULL_PATH . $this->Files[$class_name] . '</strong> containing class <strong>' . $class_name . '</strong> definition not found');
 		}
 
 		kUtil::includeOnce(FULL_PATH . $this->Files[$class_name]);
@@ -141,6 +141,7 @@
 	 * @param Array $arguments
 	 * @return kBase
 	 * @access public
+	 * @throws kFactoryException
 	 */
 	public function getObject($name, $pseudo_class = '', $event_params = Array (), $arguments = Array ())
 	{
@@ -160,7 +161,7 @@
 			$error_msg = 'RealClass not defined for pseudo_class <strong>' . $pseudo_class . '</strong>';
 
 			if ( $this->Application->isInstalled() ) {
-				throw new Exception($error_msg);
+				throw new kFactoryException($error_msg);
 			}
 			else {
 				if ( $this->Application->isDebugMode() ) {
@@ -287,4 +288,9 @@
 	{
 		unset($this->Files[$real_class]);
 	}
+}
+
+
+class kFactoryException extends Exception {
+
 }
\ No newline at end of file
Index: units/admin/admin_tag_processor.php
===================================================================
--- units/admin/admin_tag_processor.php	(revision 15419)
+++ units/admin/admin_tag_processor.php	(working copy)
@@ -851,11 +851,11 @@
 
 			$ret = '';
 			$errors = unserialize($errors);
+			$path_regexp = '/^' . preg_quote(FULL_PATH, '/') . '/';
 
 			foreach ($errors as $an_error) {
-				$block_params['file'] = str_replace(FULL_PATH, '', $an_error['file']);
-				$block_params['line'] = $an_error['line'];
-				$block_params['message'] = $an_error['msg'];
+				$block_params = array_merge($block_params, $an_error);
+				$block_params['file'] = preg_replace($path_regexp, '', $an_error['file'], 1);
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
@@ -875,6 +875,18 @@
 			return count( unserialize($errors) );
 		}
 
+		/**
+		 * Detects if given exception isn't one caused by tag error
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function IsParserException($params)
+		{
+			return mb_strtolower($params['class']) == 'parserexception';
+		}
+
 		function ExportData($params)
 		{
 			$export_helper = $this->Application->recallObject('CSVHelper');