Continued with logger facility:

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 00f35442fbc61dbde65fd8fd8197575e21b3e20d..e8dffb2c8facd206c71f2a579c9233c9c7f7608b 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -2,13 +2,13 @@
 /**
  * The application selector main include file
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  * @deprecated
- * @todo               We should minimize these includes
+ * @todo               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
@@ -26,23 +26,25 @@
 
 // Try to load these includes in the given order
 $configAppIncludes = array(
-       'class_' . FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class
+       'class_' . FrameworkConfiguration::getSelfInstance()->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
+       'config-local', // Local configuration file (optional)
        'data',                 // Application data
        'init',                 // The application initializer
        'starter',              // The application starter (calls entryPoint(), etc.)
 );
 
 // Cache base path/file here
-$basePathFile = FrameworkConfiguration::getInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getInstance()->getConfigEntry('app_name');
+$basePathFile = FrameworkConfiguration::getSelfInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name');
 
 // Is the directory there?
 if (!is_dir($basePathFile)) {
        // Not found.
-       trigger_error('Application ' . FrameworkConfiguration::getInstance()->getConfigEntry('app_name') . ' not found.');
+       trigger_error('Application ' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name') . ' not found.');
+       exit;
 } // END - if
 
 // Load them all (try only)
@@ -51,27 +53,31 @@ foreach ($configAppIncludes as $appInc) {
        if (($appInc == 'starter') && (defined('TEST'))) {
                // Skip it here
                continue;
-       }
+       } // END - if
 
        // Generate a FQFN for the helper class
        $appFqFn = $basePathFile . '/' . $appInc . '.php';
 
        // Does the include file exists?
-       if ((file_exists($appFqFn)) && (is_file($appFqFn)) && (is_readable($appFqFn))) {
+       if (BaseFrameworkSystem::isReadableFile($appFqFn)) {
                // Load it
                //* 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) {
+       } elseif (FrameworkConfiguration::getSelfInstance()->getConfigEntry('verbose_level') > 0) {
                // File is missing
-               trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
+               trigger_error(sprintf('Cannot load application script %s.php! File is missing or read-protected.',
                        $appInc
                ));
+               exit;
        }
 }
 
 // Remove variables from namespace, which we don't need
-unset($appInc, $configAppIncludes, $appFqFn, $basePathFile);
+unset($appInc);
+unset($configAppIncludes);
+unset($appFqFn);
+unset($basePathFile);
 
 // [EOF]
 ?>