Copyright updated, interface RenderableMenu added

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 33a4fa966e7a05e6d33ef2aeaca489539a3cb902..960ba6c16dda8fd32f1d27320122c1b7a886b75b 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,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
@@ -46,17 +43,13 @@ foreach ($configAppIncludes as $inc) {
        }
 
        // Generate a FQFN for the helper class
-       $fqfn = sprintf("%s%s/%s.php",
-               $cfg->readConfig('application_path'),
-               $cfg->readConfig('app_name'),
-               $inc
-       );
+       $fqfn = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name') . '/' . $inc . '.php';
 
        // Does the include file exists?
        if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
                // Load it
                require_once($fqfn);
-       } elseif ($cfg->readConfig('verbose_level') > 0) {
+       } 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
@@ -64,5 +57,8 @@ foreach ($configAppIncludes as $inc) {
        }
 }
 
+// Remove variables from namespace, which we don't need
+unset($inc, $configAppIncludes, $fqfn);
+
 // [EOF]
 ?>