X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fincludes.php;h=45d08bade71b1c18fc2e919e24fd7fc317193162;hp=7e3f5c9ffc6bf37b059d87261772ff30b4e29bc6;hb=7e46f248cc9eb9a3cd540b2e864e053f40a46bcd;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308

diff --git a/inc/includes.php b/inc/includes.php
index 7e3f5c9f..45d08bad 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, 2008 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,11 +22,15 @@
  * 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()->readConfig('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');
 
 // Does the user has an application specified?
 if (!empty($_GET['app'])) {
@@ -41,46 +45,31 @@ if (!empty($_GET['app'])) {
 		$application = trim($app[1]);
 	} else {
 		// Invalid entry found, first must be "app"!
-		$application = $cfg->readConfig('default_application');
+		$application = FrameworkConfiguration::getInstance()->readConfig('default_application');
 	}
 } else {
 	// Set the "application selector" application
-	$application = $cfg->readConfig('default_application');
+	$application = FrameworkConfiguration::getInstance()->readConfig('default_application');
 }
 
 // Secure it, by keeping out tags
 $application = htmlentities(strip_tags($application), ENT_QUOTES);
 
 // Secure it a little more with a reg.exp.
-$application = preg_replace('/([^a-z0-9_-])+/i', "", $application);
+$application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 
 // Set the application name for later usage
-$cfg->setConfigEntry('app_name', $application);
-
-/**
- * Autoload-function
- *
- * @param	$className	Name of the class to load
- * @return	void
- */
-function __autoload ($className) {
-	// Try to include this class
-	ClassLoader::getInstance()->includeClass($className);
-}
+FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
 /**
  * Is the devel package included?
  */
-if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {
+if (is_dir(FrameworkConfiguration::getInstance()->readConfig('base_path') . "devel")) {
 	/**
 	 * Load all development includes
 	 */
-	ClassLoader::getInstance()->loadClasses('devel');
-}
-
-// Shall we include additional configs where you can configure some things? Then
-// Load matching config
-ClassLoader::getInstance()->loadExtraConfigs();
+	ClassLoader::getInstance()->scanClassPath('devel');
+} // END - if
 
 // [EOF]
 ?>