X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=9d61748040789a81eec21cfd61263ca3a1ff4d9b;hp=1a3a883e19c89856e701d3b408e225231d7655fe;hb=ed7ca64368d512574efeda0f6b8d8e970d41aa1d;hpb=ca005df6eb0608fa12b23382b8ae8d1b526da4af

diff --git a/index.php b/index.php
index 1a3a883..9d61748 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,6 @@
 <?php
 // Developer mode active? Comment out if no dev!
 define('DEVELOPER', true);
-
 //xdebug_start_trace();
 /**
  * The main class with the entry point to the whole application. This class
@@ -11,11 +10,11 @@ define('DEVELOPER', true);
  *
  * But good little boys and girls would always initialize their variables... ;-)
  *
- * @author		Roland Haeder <webmaster@mxchange.org>
+ * @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
+ * @link		http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,8 +36,8 @@ class ApplicationEntryPoint {
 	 * @return	void
 	 */
 	private static $instances = array (
-		'cfg',	// The configuration system
-		'loader',	// The class loader system
+		'cfg',    // The configuration system
+		'loader', // The class loader system
 		'debug',  // Debug output
 		'db',     // Database layer
 		'io',     // Base I/O system (local file [or network])
@@ -50,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);
@@ -70,60 +71,58 @@ class ApplicationEntryPoint {
 		}
 
 		// Get some instances
-		$tpl = FrameworkConfiguration::getInstance()->readConfig('tpl_engine');
+		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
 		$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
 			try {
 				// Get the template instance from our object factory
-				$tplEngine = ObjectFactory::createObjectByConfiguredName('tpl_engine', array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
-			} catch (BasePathIsEmptyException $e) {
-				die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",
-					$e->getMessage()
-				));
-			} catch (InvalidBasePathStringException $e) {
-				die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",
-					$e->getMessage()
-				));
-			} catch (BasePathIsNoDirectoryException $e) {
-				die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",
-					$e->getMessage()
-				));
-			} catch (BasePathReadProtectedException $e) {
-				die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",
+				$templateInstance = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+			} catch (FrameworkException $e) {
+				die(sprintf("[Main:] Could not initialize template engine for reason: <strong>%s</strong>",
 					$e->getMessage()
 				));
 			}
 
-			// Backtrace holen und aufbereiten
+			// Get and prepare backtrace for output
 			$backtraceArray = debug_backtrace();
 			$backtrace = "";
 			foreach ($backtraceArray as $key=>$trace) {
 				if (!isset($trace['file'])) $trace['file'] = __FILE__;
-				if (!isset($trace['line'])) $trace['line'] = 5;
+				if (!isset($trace['line'])) $trace['line'] = __LINE__;
 				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('backtrace', $backtrace);
-			$tplEngine->assignVariable('total_objects', ObjectFactory::getTotal());
+			$templateInstance->assignVariable('message', $message);
+			$templateInstance->assignVariable('code', $code);
+			$templateInstance->assignVariable('extra', $extraData);
+			$templateInstance->assignVariable('backtrace', $backtrace);
+			$templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
+			$templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
+			$templateInstance->assignVariable('title', $lang->getMessage('emergency_exit_title'));
 
 			// Load the template
-			$tplEngine->loadCodeTemplate('emergency_exit');
+			$templateInstance->loadCodeTemplate('emergency_exit');
 
 			// Compile the template
-			$tplEngine->compileTemplate();
+			$templateInstance->compileTemplate();
 
 			// Compile all variables
-			$tplEngine->compileVariables();
+			$templateInstance->compileVariables();
+
+			// Transfer data to response
+			$templateInstance->transferToResponse($responseInstance);
 
-			// Output all
-			$tplEngine->output();
+			// Flush the response
+			$responseInstance->flushBuffer();
 
 			// Good bye...
 			exit();
@@ -158,7 +157,6 @@ class ApplicationEntryPoint {
 
 		// Include the application selector
 		require(PATH . 'inc/selector.php');
-
 	} // END - main()
 
 } // END - class