readConfig() is not naming convention, renamed to getConfigEntry()

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index f94a2c9beed3a1eb76e6f0c8fcb00adbdfc4c2f3..29572e19ce1672faf6f7862d172f7fdf360a7ec9 100644 (file)
--- 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
  *
@@ -23,12 +23,15 @@
  */
 
 // 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?
 if (!empty($_GET['app'])) {
        // Set the application from string
@@ -42,11 +45,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 +61,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