should be more encapsulated (abstracted)

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 107fbed3da41f250d34f71580f9e898c35c06341..baa8a6362b6fd3a422a3dcd5d61d2387192cb819 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -23,16 +23,17 @@
  */
 
 // Include the class loader function
-require(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/loader/class_ClassLoader.php');
+require(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
 
 // Shall we include additional configs where you can configure some things? Then
 // Load matching config
 ClassLoader::getInstance()->loadExtraConfigs();
 
 // Register hooks here
-require(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/hooks.php');
+require(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/hooks.php');
 
 // Does the user has an application specified?
+// @TODO Find a nicer OOP-ed way for this
 if (!empty($_GET['app'])) {
        // Set the application from string
        $application = (string) $_GET['app'];
@@ -45,11 +46,11 @@ if (!empty($_GET['app'])) {
                $application = trim($app[1]);
        } else {
                // Invalid entry found, first must be "app"!
-               $application = FrameworkConfiguration::getInstance()->readConfig('default_application');
+               $application = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
        }
 } else {
        // Set the "application selector" application
-       $application = FrameworkConfiguration::getInstance()->readConfig('default_application');
+       $application = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
 }
 
 // Secure it, by keeping out tags
@@ -62,7 +63,7 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
 // Is the devel package included?
-if (is_dir(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'devel')) {
+if (is_dir(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'devel')) {
        // Load all development includes
        ClassLoader::getInstance()->scanClassPath('devel');
 } // END - if