Double->single converted, framework will abort if application is not found

diff --git a/inc/includes.php b/inc/includes.php
index 45d08bade71b1c18fc2e919e24fd7fc317193162..107fbed3da41f250d34f71580f9e898c35c06341 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -61,13 +61,9 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 // Set the application name for later usage
 FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
 // Set the application name for later usage
 FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 

-/**
- * Is the devel package included?
- */
-if (is_dir(FrameworkConfiguration::getInstance()->readConfig('base_path') . "devel")) {
-       /**
-        * Load all development includes
-        */
+// Is the devel package included?
+if (is_dir(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'devel')) {
+       // Load all development includes

        ClassLoader::getInstance()->scanClassPath('devel');
 } // END - if
 
        ClassLoader::getInstance()->scanClassPath('devel');
 } // END - if
 

diff --git a/inc/selector.php b/inc/selector.php
index 0fc66eacc006405a56943f6e3561f93b2d2d5c90..05b2379deb14d45e65ae84af7a455ca0033722cb 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -37,6 +37,12 @@ $configAppIncludes = array(
 // Cache base path/file here
 $basePathFile = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name');
 
 // Cache base path/file here
 $basePathFile = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name');
 

+// Is the directory there?
+if (!is_dir($basePathFile)) {
+       // Not found.
+       trigger_error('Application ' . FrameworkConfiguration::getInstance()->readConfig('app_name') . ' not found.');
+} // END - if
+

 // Load them all (try only)
 foreach ($configAppIncludes as $appInc) {
        // Skip starter in test mode
 // Load them all (try only)
 foreach ($configAppIncludes as $appInc) {
        // Skip starter in test mode