Part added to detected hostname on Sun Solaris TODO: We should put this in seperate...

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index d20cbcb04abcd0c14fa5a5b6fa182142a5395d43..69dfe73d0ee2f85329e7a6734a7d398cacaf9e8d 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, 2008 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,45 @@
  * 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::getInstance()->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.)
 );
 
 // 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 = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name') . '/' . $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($appInc, $configAppIncludes, $appFqFn);
+
 // [EOF]
 ?>