Added accept() and doShutdown() to Taskable as this will always be needed.

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 73806ea2e5ba676b4b37d1ff5817cf7dd44a5c41..e8dffb2c8facd206c71f2a579c9233c9c7f7608b 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -2,11 +2,11 @@
 /**
  * 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 - 2012 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               Minimize these includes
  *
@@ -44,6 +44,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 +59,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;
        }
 }