X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fselector.php;h=1898557928e653b332801a047499dfcb073d0bcc;hp=69dfe73d0ee2f85329e7a6734a7d398cacaf9e8d;hb=36e4d0eb331bd724db0bd23071271d5eaeb37b17;hpb=d0b4c6f14572b8f390b357dcf48082632e53d458

diff --git a/inc/selector.php b/inc/selector.php
index 69dfe73d..18985579 100644
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -24,16 +24,25 @@
 
 // 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 $appInc) {
 	// Skip starter in test mode
@@ -43,7 +52,7 @@ foreach ($configAppIncludes as $appInc) {
 	}
 
 	// Generate a FQFN for the helper class
-	$appFqFn = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name') . '/' . $appInc . '.php';
+	$appFqFn = $basePathFile . '/' . $appInc . '.php';
 
 	// Does the include file exists?
 	if ((file_exists($appFqFn)) && (is_file($appFqFn)) && (is_readable($appFqFn))) {
@@ -51,7 +60,7 @@ foreach ($configAppIncludes as $appInc) {
 		//* 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) {
+	} 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.",
 			$appInc
@@ -60,7 +69,7 @@ foreach ($configAppIncludes as $appInc) {
 }
 
 // Remove variables from namespace, which we don't need
-unset($appInc, $configAppIncludes, $appFqFn);
+unset($appInc, $configAppIncludes, $appFqFn, $basePathFile);
 
 // [EOF]
 ?>