X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=9ad3a004105a12bfcd8a035112395d454870a184;hp=857b1561ba6e88ae5e09a3c20ef388835583df1a;hb=6019ae86707cb6decaddc63f191e3ef6eb5e4d44;hpb=d527a312ec4b2983fc0ecda2179ce335c1a5a1f9

diff --git a/index.php b/index.php
index 857b156..9ad3a00 100644
--- a/index.php
+++ b/index.php
@@ -12,7 +12,7 @@ define('DEVELOPER', true);
  *
  * @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, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -49,15 +49,17 @@ class ApplicationEntryPoint {
 	/**
 	 * The application's emergency exit
 	 *
-	 * @param		$message	The optional message we shall output on exit
+	 * @param	$message	The optional message we shall output on exit
+	 * @param	$code		Error code from exception
+	 * @param	$extraData	Extra information from exceptions
 	 * @return	void
 	 */
-	public static function app_die ($message = "") {
+	public static function app_die ($message = "", $code = false, $extraData = "") {
 		// Is this method already called?
 		if (defined('EMERGENCY_EXIT_CALLED')) {
 			// Then output the text directly
 			die($message);
-		}
+		} // END - if
 
 		// This method shall not be called twice
 		define('EMERGENCY_EXIT_CALLED', true);
@@ -73,6 +75,9 @@ class ApplicationEntryPoint {
 		$lang = LanguageSystem::getInstance();
 		$io = FileIoHandler::getInstance();
 
+		// Get response instance
+		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
+
 		// Is the template engine loaded?
 		if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
 			// Use the template engine for putting out (nicer look) the message
@@ -105,10 +110,12 @@ class ApplicationEntryPoint {
 				if (!isset($trace['line'])) $trace['line'] = 5;
 				if (!isset($trace['args'])) $trace['args'] = array();
 				$backtrace .= "<span class=\"backtrace_file\">".basename($trace['file'])."</span>:".$trace['line'].", <span class=\"backtrace_function\">".$trace['function']."(".count($trace['args']).")</span><br />";
-			}
+			} // END - foreach
 
 			// Assign variables
 			$tplEngine->assignVariable('message', $message);
+			$tplEngine->assignVariable('code', $code);
+			$tplEngine->assignVariable('extra', $extraData);
 			$tplEngine->assignVariable('backtrace', $backtrace);
 			$tplEngine->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
 			$tplEngine->assignVariable('total_objects', ObjectFactory::getTotal());
@@ -122,8 +129,11 @@ class ApplicationEntryPoint {
 			// Compile all variables
 			$tplEngine->compileVariables();
 
-			// Output all
-			$tplEngine->output();
+			// Transfer data to response
+			$tplEngine->transferToResponse($responseInstance);
+
+			// Flush the response
+			$responseInstance->flushBuffer();
 
 			// Good bye...
 			exit();