State (see State Pattern) prepared, a lot reworked/refactured

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 33a4fa966e7a05e6d33ef2aeaca489539a3cb902..1898557928e653b332801a047499dfcb073d0bcc 100644 (file)
--- 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,47 +22,54 @@
  * 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()->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 = 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::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($appInc, $configAppIncludes, $appFqFn, $basePathFile);
+
 // [EOF]
 ?>