X-Git-Url: https://git.mxchange.org/?p=install.git;a=blobdiff_plain;f=index.php;h=979aa45f3d9642dd186e00ad7557abc7a78d540f;hp=005004646b5cee9d87e2ae89b499f8f675e6604d;hb=170a51c93803d93debe77efd67561dedbc5adf84;hpb=381a43b880c0dc68f62bff37742c3f965ec37f4f

diff --git a/index.php b/index.php
index 0050046..979aa45 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
  *
@@ -62,13 +62,13 @@ final class ApplicationEntryPoint {
 	 */
 	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)) {
@@ -80,20 +80,20 @@ final class ApplicationEntryPoint {
 		$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
@@ -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');
@@ -190,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