Continued rewriting:

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 6f42112e066f30e99c1f07f8cfdcbb2713a04612..7c8594f20a0156d08a2202be80afe0126fa4080c 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -1,10 +1,14 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * The application selector main include file
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated
@@ -26,10 +30,9 @@
 
 // Try to load these includes in the given order
 $configAppIncludes = array(
-       'class_' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class
+       'class_ApplicationHelper', // 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
@@ -44,6 +47,7 @@ $basePathFile = FrameworkConfiguration::getSelfInstance()->getConfigEntry('appli
 if (!is_dir($basePathFile)) {
        // Not found.
        trigger_error('Application ' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name') . ' not found.');
+       exit;
 } // END - if
 
 // Load them all (try only)
@@ -58,16 +62,17 @@ foreach ($configAppIncludes as $appInc) {
        $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::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;
        }
 }
 
@@ -77,5 +82,5 @@ unset($configAppIncludes);
 unset($appFqFn);
 unset($basePathFile);
 
-// [EOF]
-?>
+// Scan for application's classes, exceptions and interfaces
+ClassLoader::scanApplicationClasses();