Variable cfg refactured

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 20128dbb0776595cae72ce0fbada5d5bde649aee..f94a2c9beed3a1eb76e6f0c8fcb00adbdfc4c2f3 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -22,11 +22,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
 // Include the class loader function
-require($cfg->readConfig('base_path') . 'inc/loader/class_ClassLoader.php');
+require(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/loader/class_ClassLoader.php');
 
 // Shall we include additional configs where you can configure some things? Then
 // Load matching config
@@ -45,11 +42,11 @@ if (!empty($_GET['app'])) {
                $application = trim($app[1]);
        } else {
                // Invalid entry found, first must be "app"!
-               $application = $cfg->readConfig('default_application');
+               $application = FrameworkConfiguration::getInstance()->readConfig('default_application');
        }
 } else {
        // Set the "application selector" application
-       $application = $cfg->readConfig('default_application');
+       $application = FrameworkConfiguration::getInstance()->readConfig('default_application');
 }
 
 // Secure it, by keeping out tags
@@ -59,7 +56,7 @@ $application = htmlentities(strip_tags($application), ENT_QUOTES);
 $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 
 // Set the application name for later usage
-$cfg->setConfigEntry('app_name', $application);
+FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
 // Register auto-load function with the SPL
 spl_autoload_register('ClassLoader::autoLoad');
@@ -67,7 +64,7 @@ spl_autoload_register('ClassLoader::autoLoad');
 /**
  * Is the devel package included?
  */
-if (is_dir($cfg->readConfig('base_path') . "devel")) {
+if (is_dir(FrameworkConfiguration::getInstance()->readConfig('base_path') . "devel")) {
        /**
         * Load all development includes
         */