X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=62f3069b32d1af25c7da5d0f3f10fc5c0a2a964e;hp=5b3894a3797ad1534645ad861269651dba6c1180;hb=f42bf974e65e115c7f5d3af9fe3c4b6407c617b9;hpb=8ff12f905898b0c2b7ff8124c9749ad6fb9c44f3

diff --git a/index.php b/index.php
index 5b3894a..62f3069 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@ define('DEVELOPER', true);
 //xdebug_start_trace();
 /**
  * The main class with the entry point to the whole application. This class
- * "emulates" Java(tm)'s entry point call. Additionally it covers local
+ * "emulates" Java's entry point call. Additionally it covers local
  * variables from outside access to prevent possible attacks on uninitialized
  * local variables.
  *
@@ -49,12 +49,13 @@ class ApplicationEntryPoint {
 	/**
 	 * The application's emergency exit
 	 *
-	 * @param	$message	The optional message we shall output on exit
-	 * @param	$code		Error code from exception
-	 * @param	$extraData	Extra information from exceptions
+	 * @param	$message		The optional message we shall output on exit
+	 * @param	$code			Error code from exception
+	 * @param	$extraData		Extra information from exceptions
+	 * @param	$silentMode		Wether not silent mode is turned on
 	 * @return	void
 	 */
-	public static function app_die ($message = "", $code = false, $extraData = "") {
+	public static function app_die ($message = "", $code = false, $extraData = "", $silentMode = false) {
 		// Is this method already called?
 		if (defined('EMERGENCY_EXIT_CALLED')) {
 			// Then output the text directly
@@ -70,6 +71,15 @@ class ApplicationEntryPoint {
 			$message = "No message provided!";
 		} // END - if
 
+		// Get config instance
+		$configInstance = FrameworkConfiguration::getInstance();
+
+		// Do we have debug installation?
+		if (($configInstance->readConfig('product_install_mode') == "productive") || ($silentMode === true)) {
+			// Abort here
+			die();
+		} // END - if
+
 		// Get some instances
 		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
 		$lang = LanguageSystem::getInstance();
@@ -85,7 +95,7 @@ class ApplicationEntryPoint {
 				// Get the template instance from our object factory
 				$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>",
+				die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
 					$e->getMessage()
 				));
 			}
@@ -150,14 +160,11 @@ class ApplicationEntryPoint {
 	 * The application's main entry point. This class isolates some local
 	 * variables which shall not become visible to outside because of security
 	 * concerns. We are doing this here to "emulate" the well-known entry
-	 * point in Java(tm).
+	 * point in Java.
 	 *
 	 * @return	void
 	 */
 	public static function main () {
-		// Some non-global common arrays we need...
-		global $_SERVER;
-
 		// Load config file
 		require(dirname(__FILE__) . '/inc/config.php');