X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=f2e1c4c49508273bec169275150700d1292e9d98;hp=3945af962076cc247ed0e9b1ab2e30f6a3c3e30d;hb=dc6440a11e585e293a881bec3076ccd8cee5c1ad;hpb=ec430a01c002d250f72ddcf80305cd2576073161

diff --git a/index.php b/index.php
index 3945af9..f2e1c4c 100644
--- a/index.php
+++ b/index.php
@@ -12,7 +12,7 @@ define('DEVELOPER', true);
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -60,7 +60,7 @@ final class ApplicationEntryPoint {
 	 * @param	$silentMode		Wether not silent mode is turned on
 	 * @return	void
 	 */
-	public static function app_die ($message = "", $code = false, $extraData = "", $silentMode = false) {
+	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
@@ -73,27 +73,27 @@ final class ApplicationEntryPoint {
 		// Is a message set?
 		if (empty($message)) {
 			// No message provided
-			$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)) {
+		if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
 			// Abort here
 			die();
 		} // END - if
 
 		// Get some instances
-		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
-		$lang = LanguageSystem::getInstance();
+		$tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
+		$languageInstance = LanguageSystem::getInstance();
 
 		// Get response instance
 		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
 		// Is the template engine loaded?
-		if ((class_exists($tpl)) && (is_object($lang))) {
+		if ((class_exists($tpl)) && (is_object($languageInstance))) {
 			// Use the template engine for putting out (nicer look) the message
 			try {
 				// Get the template instance from our object factory
@@ -106,7 +106,7 @@ final class ApplicationEntryPoint {
 
 			// Get and prepare backtrace for output
 			$backtraceArray = debug_backtrace();
-			$backtrace = "";
+			$backtrace = '';
 			foreach ($backtraceArray as $key => $trace) {
 				if (!isset($trace['file'])) $trace['file'] = __FILE__;
 				if (!isset($trace['line'])) $trace['line'] = __LINE__;
@@ -133,7 +133,7 @@ final class ApplicationEntryPoint {
 			$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'));
+			$templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));
 
 			// Load the template
 			$templateInstance->loadCodeTemplate('emergency_exit');
@@ -161,7 +161,8 @@ final class ApplicationEntryPoint {
 	}
 
 	/**
-	 * Determines the correct absolute path for all include
+	 * 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
 	 */
@@ -189,13 +190,13 @@ final class ApplicationEntryPoint {
 		require(self::detectCorePath() . '/inc/config.php');
 
 		// Load all include files
-		require($cfg->readConfig('base_path') . 'inc/includes.php');
+		require($cfg->getConfigEntry('base_path') . 'inc/includes.php');
 
 		// Load all framework classes
-		require($cfg->readConfig('base_path') . 'inc/classes.php');
+		require($cfg->getConfigEntry('base_path') . 'inc/classes.php');
 
 		// Include the application selector
-		require($cfg->readConfig('base_path') . 'inc/selector.php');
+		require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
 	} // END - main()
 
 } // END - class