X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fincludes.php;h=39be877dfe44369e0210269a3d8542b535be5102;hp=059df0b30de40ad3e4e964baaa3c1e7b12fdecb8;hb=9aeecff34797942ce8d4ce03a2dc966dc1dbf702;hpb=3b369c267715db8baefd28b85375406946270ebd;ds=sidebyside

diff --git a/inc/includes.php b/inc/includes.php
index 059df0b3..39be877d 100644
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -2,13 +2,13 @@
 /**
  * Loads more include files by using the generic class loader
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  * @deprecated
- * @todo		We should minimize these includes
+ * @todo		Minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,14 +25,17 @@
  */
 
 // Include the class loader function
-require(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
+require(FrameworkConfiguration::getSelfInstance()->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();
+/*
+ * Shall we include additional configs where you can configure some things?
+ * Then load matching config file.
+ */
+ClassLoader::getSelfInstance()->loadExtraConfigs();
 
-// Register hooks here
-require(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/hooks.php');
+// Register auto-load function with the SPL
+// @TODO This makes the core depending on the SPL. But it should be installed anyway.
+spl_autoload_register('ClassLoader::autoLoad');
 
 // Does the user has an application specified?
 // @TODO Find a nicer OOP-ed way for this
@@ -48,11 +51,11 @@ if (!empty($_GET['app'])) {
 		$application = trim($app[1]);
 	} else {
 		// Invalid entry found, first must be "app"!
-		$application = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
+		$application = FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_application');
 	}
 } else {
 	// Set the "application selector" application
-	$application = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
+	$application = FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_application');
 }
 
 // Secure it, by keeping out tags
@@ -62,7 +65,10 @@ $application = htmlentities(strip_tags($application), ENT_QUOTES);
 $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 
 // Set the application name for later usage
-FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
+FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application);
+
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();
 
 // [EOF]
 ?>