X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fexceptions.php;h=ef9e8452af8e6b6a537ecfb159e650a994275b16;hb=d1f059194db471b16e294d25918ac1a621736211;hp=3b021f65551f2c1c1b2f81cd1aad7078dab400fb;hpb=56459e5bcba52c635e971cd0918e8270447dd468;p=shipsimu.git

diff --git a/application/ship-simu/exceptions.php b/application/ship-simu/exceptions.php
index 3b021f6..ef9e845 100644
--- a/application/ship-simu/exceptions.php
+++ b/application/ship-simu/exceptions.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -25,15 +25,18 @@
 // Our own exception handler
 function __exceptionHandler (FrameworkException $e) {
 	// Call the app_die() method
-	ApplicationEntryPoint::app_die(sprintf("[Main:] The application <strong>%s</strong> (<strong>%s</strong>) has been terminated due to a thrown exception: <span id=\"exception_name\">%s</span> <span id=\"exception_number\">[%s]</span>: <span id=\"debug_exception\">%s</span> Backtrace: <div id=\"debug_backtrace\">%s</div>",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to an uncaught exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
 		ApplicationHelper::getInstance()->getAppName(),
 		ApplicationHelper::getInstance()->getAppShortName(),
 		$e->__toString(),
 		$e->getHexCode(),
 		$e->getMessage(),
 		$e->getPrintableBackTrace()
-	));
-}
+	),
+		$e->getHexCode(),
+		$e->getExtraData()
+	);
+} // END - function
 
 // Set the new handler
 set_exception_handler('__exceptionHandler');
@@ -41,7 +44,7 @@ set_exception_handler('__exceptionHandler');
 // Error handler
 function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
 	// Construct the message
-	$message = sprintf("File: <span id=\"debug_file\">%s</span>, Line: <span id=\"debug_line\">%s</span>, Code: <span id=\"debug_code\">%s</span>, Message: <span id=\"debug_message\">%s</span>",
+	$message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>, Message: <span class=\"debug_message\">%s</span>",
 		basename($errfile),
 		$errline,
 		$errno,
@@ -50,10 +53,33 @@ function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext)
 
 	// Throw an exception here
 	throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-}
+} // END - function
 
 // Set error handler
 set_error_handler('__errorHandler');
 
+// Assertion handler
+function __assertHandler ($file, $line, $code) {
+	// Empty code?
+	if ($code === "") $code = "<em>Unknown</em>";
+
+	// Create message
+	$message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>",
+		basename($file),
+		$line,
+		$code
+	);
+
+	// Throw an exception here
+	throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
+} // END - function
+
+// Init assert handling
+assert_options(ASSERT_ACTIVE,     1);
+assert_options(ASSERT_WARNING,    0);
+assert_options(ASSERT_BAIL,       0);
+assert_options(ASSERT_QUIET_EVAL, 0);
+assert_options(ASSERT_CALLBACK,   '__assertHandler');
+
 // [EOF]
 ?>