X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fselector.php;h=73806ea2e5ba676b4b37d1ff5817cf7dd44a5c41;hp=40789c0c97a58cdf1437864218a24042a359c472;hb=c494848d03b5dc76e698b28aeb3c3f7301bdb2f5;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae

diff --git a/inc/selector.php b/inc/selector.php
index 40789c0c..73806ea2 100644
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -4,9 +4,11 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
+ * @deprecated
+ * @todo		Minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,47 +24,58 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
 // Try to load these includes in the given order
 $configAppIncludes = array(
-	sprintf("class_%s", $cfg->readConfig('app_helper_class')), // The ApplicationHelper class
-	"config",		// The application's own configuration
-	"data",			// Application data
-	"init",			// The application initializer
-	"loader",		// The application's class loader
-	"debug",		// Some debugging stuff
-	"exceptions",	// The application's own exception handler
-	"starter",		// The application starter (calls entryPoint(), etc.)
+	'class_' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class
+	'debug',		// Some debugging stuff
+	'exceptions',	// The application's own exception handler
+	'loader',		// The application's class loader
+	'config',		// The application's own configuration
+	'config-local',	// Local configuration file (optional)
+	'data',			// Application data
+	'init',			// The application initializer
+	'starter',		// The application starter (calls entryPoint(), etc.)
 );
 
+// Cache base path/file here
+$basePathFile = FrameworkConfiguration::getSelfInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name');
+
+// Is the directory there?
+if (!is_dir($basePathFile)) {
+	// Not found.
+	trigger_error('Application ' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name') . ' not found.');
+} // END - if
+
 // Load them all (try only)
-foreach ($configAppIncludes as $inc) {
+foreach ($configAppIncludes as $appInc) {
 	// Skip starter in test mode
-	if (($inc == "starter") && (defined('TEST'))) {
+	if (($appInc == 'starter') && (defined('TEST'))) {
 		// Skip it here
 		continue;
-	}
+	} // END - if
 
 	// Generate a FQFN for the helper class
-	$fqfn = sprintf("%s%s/%s.php",
-		$cfg->readConfig('application_path'),
-		$cfg->readConfig('app_name'),
-		$inc
-	);
+	$appFqFn = $basePathFile . '/' . $appInc . '.php';
 
 	// Does the include file exists?
-	if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
+	if ((file_exists($appFqFn)) && (is_file($appFqFn)) && (is_readable($appFqFn))) {
 		// Load it
-		require_once($fqfn);
-	} elseif ($cfg->readConfig('verbose_level') > 0) {
+		//* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - START\n";
+		require($appFqFn);
+		//* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - END\n";
+	} elseif (FrameworkConfiguration::getSelfInstance()->getConfigEntry('verbose_level') > 0) {
 		// File is missing
 		trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
-			$inc
+			$appInc
 		));
 	}
 }
 
+// Remove variables from namespace, which we don't need
+unset($appInc);
+unset($configAppIncludes);
+unset($appFqFn);
+unset($basePathFile);
+
 // [EOF]
 ?>