X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fselector.php;h=05b2379deb14d45e65ae84af7a455ca0033722cb;hp=7e7dee502a316feb47ebdecce3af46a4feb6e6b5;hb=6d749a6218d922b2f9bca9cc95f67a5cf99ab4fe;hpb=49f84a522f0ccac3b70728cd41011a0be0eed8cf

diff --git a/inc/selector.php b/inc/selector.php
index 7e7dee50..05b2379d 100644
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -4,7 +4,7 @@
  *
  * @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 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -22,12 +22,9 @@
  * 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(
-	'class_' . $cfg->readConfig('app_helper_class'), // The ApplicationHelper class
+	'class_' . FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), // The ApplicationHelper class
 	'config',		// The application's own configuration
 	'data',			// Application data
 	'init',			// The application initializer
@@ -37,31 +34,42 @@ $configAppIncludes = array(
 	'starter',		// The application starter (calls entryPoint(), etc.)
 );
 
+// Cache base path/file here
+$basePathFile = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name');
+
+// Is the directory there?
+if (!is_dir($basePathFile)) {
+	// Not found.
+	trigger_error('Application ' . FrameworkConfiguration::getInstance()->readConfig('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;
 	}
 
 	// Generate a FQFN for the helper class
-	$fqfn = $cfg->readConfig('application_path') . $cfg->readConfig('app_name') . '/' . $inc . '.php';
+	$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::getInstance()->readConfig('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($cfg, $inc, $configAppIncludes, $fqfn);
+unset($appInc, $configAppIncludes, $appFqFn, $basePathFile);
 
 // [EOF]
 ?>