X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fexceptions.php;h=f463a9c508231453ed2abad412a5d15d00a96fa8;hb=3eda441b496fe55fa22a5b748235c39015d1e081;hp=b5b8bdc9e83632cddc5388abb02678e9fd4a70fa;hpb=6ea47cac34fd28b9d8157ceb1d643f7bfc6a4379;p=shipsimu.git diff --git a/application/ship-simu/exceptions.php b/application/ship-simu/exceptions.php index b5b8bdc..f463a9c 100644 --- a/application/ship-simu/exceptions.php +++ b/application/ship-simu/exceptions.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright(c) 2007, 2008 Roland Haeder, this is free software + * @copyright Copyright (c) 2007, 2008 Roland Haeder, this is free software * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -25,14 +25,17 @@ // Our own exception handler function __exceptionHandler (FrameworkException $e) { // Call the app_die() method - ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s (%s) has been terminated due to a thrown exception: %s [%s]: %s Backtrace:
%s
", + ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s (%s) has been terminated due to a thrown exception: %s [%s]: %s Backtrace:
%s
", ApplicationHelper::getInstance()->getAppName(), ApplicationHelper::getInstance()->getAppShortName(), $e->__toString(), $e->getHexCode(), $e->getMessage(), $e->getPrintableBackTrace() - )); + ), + $e->getHexCode(), + $e->getExtraData() + ); } // END - function // Set the new handler @@ -41,7 +44,7 @@ set_exception_handler('__exceptionHandler'); // Error handler function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) { // Construct the message - $message = sprintf("File: %s, Line: %s, Code: %s, Message: %s", + $message = sprintf("File: %s, Line: %s, Code: %s, Message: %s", basename($errfile), $errline, $errno, @@ -61,7 +64,7 @@ function __assertHandler ($file, $line, $code) { if ($code === "") $code = "Unknown"; // Create message - $message = sprintf("File: %s, Line: %s, Code: %s", + $message = sprintf("File: %s, Line: %s, Code: %s", basename($file), $line, $code