X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fselector.php;h=1898557928e653b332801a047499dfcb073d0bcc;hp=960ba6c16dda8fd32f1d27320122c1b7a886b75b;hb=fe5cbde27a571db160694ebb0eb9be02af57dd5a;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/selector.php b/inc/selector.php
index 960ba6c1..18985579 100644
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -24,41 +24,52 @@
 
 // Try to load these includes in the given order
 $configAppIncludes = array(
-	'class_' . FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), // The ApplicationHelper class
+	'class_' . FrameworkConfiguration::getInstance()->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
 	'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.)
 );
 
+// Cache base path/file here
+$basePathFile = FrameworkConfiguration::getInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getInstance()->getConfigEntry('app_name');
+
+// Is the directory there?
+if (!is_dir($basePathFile)) {
+	// Not found.
+	trigger_error('Application ' . FrameworkConfiguration::getInstance()->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;
 	}
 
 	// Generate a FQFN for the helper class
-	$fqfn = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->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 (FrameworkConfiguration::getInstance()->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()->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($inc, $configAppIncludes, $fqfn);
+unset($appInc, $configAppIncludes, $appFqFn, $basePathFile);
 
 // [EOF]
 ?>