We no longer need this old piece of code

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 2cf6aaafb399db9e3524e4be652ce03b99bcead6..f4088d9045e2593a8efd68a7f9eac83d889deff8 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, 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,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,42 +46,21 @@ 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
 $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);
-}
-
-/**
- * Is the devel package included?
- */
-if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {
-       /**
-        * Load all development includes
-        */
-       ClassLoader::getInstance()->loadClasses('devel');
-}
+FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
 // [EOF]
 ?>