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

diff --git a/inc/includes.php b/inc/includes.php
index 61e8bb97..baa8a636 100644
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -22,17 +22,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
 // Include the class loader function
-require(sprintf("%sinc/loader/class_ClassLoader.php", $cfg->readConfig('base_path')));
+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'];
@@ -45,11 +46,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()->getConfigEntry('default_application');
 	}
 } else {
 	// Set the "application selector" application
-	$application = $cfg->readConfig('default_application');
+	$application = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
 }
 
 // Secure it, by keeping out tags
@@ -59,18 +60,11 @@ $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);
-
-// Register auto-load function with the SPL
-spl_autoload_register('ClassLoader::autoLoad');
+FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
-/**
- * Is the devel package included?
- */
-if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {
-	/**
-	 * 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