Variable handling in template engine rewritten

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 69dfe73d0ee2f85329e7a6734a7d398cacaf9e8d..51f6c43db5016189b73cc123faaae603e276c525 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -4,9 +4,11 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
+ * @deprecated
+ * @todo               We should minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,16 +26,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 +54,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 +62,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 +71,7 @@ foreach ($configAppIncludes as $appInc) {
 }
 
 // Remove variables from namespace, which we don't need
-unset($appInc, $configAppIncludes, $appFqFn);
+unset($appInc, $configAppIncludes, $appFqFn, $basePathFile);
 
 // [EOF]
 ?>