X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=5b3894a3797ad1534645ad861269651dba6c1180;hp=9986c919adc14c8d5ffa75ed95e6ee855a80b55e;hb=84369c88ca8f57a1e4d9d20cdd4adf45576c5cd8;hpb=d0b833b090c7cb50e075e4b08d052d415780faa0

diff --git a/index.php b/index.php
index 9986c91..5b3894a 100644
--- a/index.php
+++ b/index.php
@@ -68,7 +68,7 @@ class ApplicationEntryPoint {
 		if (empty($message)) {
 			// No message provided
 			$message = "No message provided!";
-		}
+		} // END - if
 
 		// Get some instances
 		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
@@ -83,7 +83,7 @@ class ApplicationEntryPoint {
 			// Use the template engine for putting out (nicer look) the message
 			try {
 				// Get the template instance from our object factory
-				$tplEngine = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+				$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()
@@ -93,33 +93,45 @@ 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
-			$tplEngine->assignVariable('message', $message);
-			$tplEngine->assignVariable('code', $code);
-			$tplEngine->assignVariable('extra', $extraData);
-			$tplEngine->assignVariable('backtrace', $backtrace);
-			$tplEngine->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
-			$tplEngine->assignVariable('total_objects', ObjectFactory::getTotal());
-			$tplEngine->assignVariable('title', $lang->getMessage('emergency_exit_title'));
+			$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
-			$tplEngine->transferToResponse($responseInstance);
+			$templateInstance->transferToResponse($responseInstance);
 
 			// Flush the response
 			$responseInstance->flushBuffer();
@@ -150,13 +162,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