X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fincludes.php;h=f4088d9045e2593a8efd68a7f9eac83d889deff8;hb=1dfce1c5d3a9102021322559085bd69f49c981cc;hp=107fbed3da41f250d34f71580f9e898c35c06341;hpb=6d749a6218d922b2f9bca9cc95f67a5cf99ab4fe;p=core.git

diff --git a/inc/includes.php b/inc/includes.php
index 107fbed3..f4088d90 100644
--- 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
@@ -61,11 +62,5 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $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
-	ClassLoader::getInstance()->scanClassPath('devel');
-} // END - if
-
 // [EOF]
 ?>