X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fincludes.php;h=baa8a6362b6fd3a422a3dcd5d61d2387192cb819;hp=3f7135cabd7e56ea1009914d3ed51e2f2e69b667;hb=73bb9000fb82cfb51d3e55f0d1f7f6d09974368e;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/includes.php b/inc/includes.php
index 3f7135ca..baa8a636 100644
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -23,13 +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()->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'];
@@ -42,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
@@ -58,16 +62,9 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 // Set the application name for later usage
 FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
-// Register auto-load function with the SPL
-spl_autoload_register('ClassLoader::autoLoad');
-
-/**
- * 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()->getConfigEntry('base_path') . 'devel')) {
+	// Load all development includes
 	ClassLoader::getInstance()->scanClassPath('devel');
 } // END - if