X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=782525e1a5e8805293db8aeb877edb6190fabc5c;hb=a4150e60a1184d31f732fab399c3547671b73eb1;hp=6f4585b3dcec4e5637396e6b1296da7fe7fe9368;hpb=b5ad00752a8c66faa7813cae5709975a3e7433e0;p=hub.git

diff --git a/index.php b/index.php
index 6f4585b3d..782525e1a 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,4 @@
 <?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
  * "emulates" Java's entry point call. Additionally it covers local
@@ -12,7 +9,7 @@ define('DEVELOPER', true);
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -59,8 +56,9 @@ final class ApplicationEntryPoint {
 	 * @param	$extraData		Extra information from exceptions
 	 * @param	$silentMode		Wether not silent mode is turned on
 	 * @return	void
+	 * @todo	This method is old code and needs heavy rewrite
 	 */
-	public static function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
+	public static final function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
 		// Is this method already called?
 		if (isset($GLOBALS['app_die_called'])) {
 			// Then output the text directly
@@ -89,6 +87,9 @@ final class ApplicationEntryPoint {
 		$tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
 		$languageInstance = LanguageSystem::getInstance();
 
+		// Initialize template instance here to avoid warnings in IDE
+		$templateInstance = null;
+
 		// Get response instance
 		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
@@ -97,7 +98,7 @@ final class ApplicationEntryPoint {
 			// Use the template engine for putting out (nicer look) the message
 			try {
 				// Get the template instance from our object factory
-				$templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
+				$templateInstance = ObjectFactory::createObjectByName($tpl);
 			} catch (FrameworkException $e) {
 				die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
 					$e->getMessage()
@@ -120,40 +121,46 @@ final class ApplicationEntryPoint {
 			} // END - foreach
 
 			// Init application instance
-			$appInstance = null;
+			$applicationInstance = null;
 
 			// Is the class there?
 			if (class_exists('ApplicationHelper')) {
 				// Get application instance
-				$appInstance = ApplicationHelper::getInstance();
+				$applicationInstance = ApplicationHelper::getInstance();
 
 				// Assign application data
-				$templateInstance->assignApplicationData($appInstance);
+				$templateInstance->assignApplicationData($applicationInstance);
 			} // END - if
 
-			// Assign variables
-			$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', $languageInstance->getMessage('emergency_exit_title'));
-
-			// Load the template
-			$templateInstance->loadCodeTemplate('emergency_exit');
-
-			// Compile the template
-			$templateInstance->compileTemplate();
-
-			// Compile all variables
-			$templateInstance->compileVariables();
-
-			// Transfer data to response
-			$templateInstance->transferToResponse($responseInstance);
-
-			// Flush the response
-			$responseInstance->flushBuffer();
+			// We only try this
+			try {
+				// Assign variables
+				$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', $languageInstance->getMessage('emergency_exit_title'));
+
+				// Load the template
+				$templateInstance->loadCodeTemplate('emergency_exit');
+
+				// Compile the template
+				$templateInstance->compileTemplate();
+
+				// Compile all variables
+				$templateInstance->compileVariables();
+
+				// Transfer data to response
+				$templateInstance->transferToResponse($responseInstance);
+
+				// Flush the response
+				$responseInstance->flushBuffer();
+			} catch (FileIoException $e) {
+				// Even the template 'emergency_exit' wasn't found so output both message
+				die($message . ', exception: ' . $e->getMessage());
+			}
 
 			// Good bye...
 			exit();
@@ -169,9 +176,9 @@ final class ApplicationEntryPoint {
 	 * Determines the correct absolute path for all includes only once per run.
 	 * Other calls of this method are being "cached".
 	 *
-	 * @return	$basePath	Base path (core) for all includes
+	 * @return	$corePath	Base path (core) for all includes
 	 */
-	protected static function detectCorePath () {
+	protected static final function detectCorePath () {
 		// Is it not set?
 		if (empty(self::$corePath)) {
 			// Auto-detect our core path
@@ -190,7 +197,7 @@ final class ApplicationEntryPoint {
 	 *
 	 * @return	void
 	 */
-	public static function main () {
+	public static final function main () {
 		// Load config file
 		require(self::detectCorePath() . '/inc/config.php');
 
@@ -205,6 +212,14 @@ final class ApplicationEntryPoint {
 	} // END - main()
 } // END - class
 
+// Developer mode active? Comment out if no dev!
+define('DEVELOPER', true);
+
+// Log all exceptions (only debug! This option can create large error logs)
+//define('LOG_EXCEPTIONS', true);
+
+//xdebug_start_trace();
+
 // Do not remove the following line:
 ApplicationEntryPoint::main();