X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=4cef375d4e157428a51840175e9bfe3114948aff;hb=aa4ac5d61eab8540e9902396998f3f53718eeaf5;hp=f2e1c4c49508273bec169275150700d1292e9d98;hpb=c359882f9d18c51d4360913a3c7ca1867c00975b;p=hub.git

diff --git a/index.php b/index.php
index f2e1c4c49..4cef375d4 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, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -59,16 +56,17 @@ 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) {
 		// Is this method already called?
-		if (defined('EMERGENCY_EXIT_CALLED')) {
+		if (isset($GLOBALS['app_die_called'])) {
 			// Then output the text directly
 			die($message);
 		} // END - if
 
 		// This method shall not be called twice
-		define('EMERGENCY_EXIT_CALLED', true);
+		$GLOBALS['app_die_called'] = true;
 
 		// Is a message set?
 		if (empty($message)) {
@@ -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();
 
@@ -111,7 +112,12 @@ final class ApplicationEntryPoint {
 				if (!isset($trace['file'])) $trace['file'] = __FILE__;
 				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 />";
+				$backtrace .= sprintf("<span class=\"backtrace_file\">%s</span>:%d, <span class=\"backtrace_function\">%s(%d)</span><br />\n",
+					basename($trace['file']),
+					$trace['line'],
+					$trace['function'],
+					count($trace['args'])
+				);
 			} // END - foreach
 
 			// Init application instance
@@ -198,9 +204,16 @@ final class ApplicationEntryPoint {
 		// Include the application selector
 		require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
 	} // 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();