X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=a6846bf8cc21ee7690c5a8bcf949a348311b1bdf;hb=6d61b430c9bc33861d130064f049d3e1e80f089b;hp=9d61748040789a81eec21cfd61263ca3a1ff4d9b;hpb=8fb8d5ba399ce3233839d3d09faa3268c96ae454;p=shipsimu.git

diff --git a/index.php b/index.php
index 9d61748..a6846bf 100644
--- a/index.php
+++ b/index.php
@@ -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
@@ -68,7 +69,16 @@ class ApplicationEntryPoint {
 		if (empty($message)) {
 			// No message provided
 			$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');
@@ -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()
 				));
 			}
@@ -93,13 +103,25 @@ class ApplicationEntryPoint {
 			// Get and prepare backtrace for output
 			$backtraceArray = debug_backtrace();
 			$backtrace = "";
-			foreach ($backtraceArray as $key=>$trace) {
+			foreach ($backtraceArray as $key => $trace) {
 				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 />";
 			} // END - foreach
 
+			// Init application instance
+			$appInstance = null;
+
+			// Is the class there?
+			if (class_exists('ApplicationHelper')) {
+				// Get application instance
+				$appInstance = ApplicationHelper::getInstance();
+
+				// Assign application data
+				$templateInstance->assignApplicationData($appInstance);
+			} // END - if
+
 			// Assign variables
 			$templateInstance->assignVariable('message', $message);
 			$templateInstance->assignVariable('code', $code);
@@ -150,13 +172,13 @@ class ApplicationEntryPoint {
 		require(dirname(__FILE__) . '/inc/config.php');
 
 		// Load all include files
-		require(PATH . 'inc/includes.php');
+		require($cfg->readConfig('base_path') . 'inc/includes.php');
 
 		// Load all framework classes
-		require(PATH . 'inc/classes.php');
+		require($cfg->readConfig('base_path') . 'inc/classes.php');
 
 		// Include the application selector
-		require(PATH . 'inc/selector.php');
+		require($cfg->readConfig('base_path') . 'inc/selector.php');
 	} // END - main()
 
 } // END - class