loadController() is now more generic (TODO: check that all other apps works)

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 61e8bb971e5f0cce769619492a337cd0e9bcff84..45d08bade71b1c18fc2e919e24fd7fc317193162 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
  *
  * @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
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -22,16 +22,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 

-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-

 // Include the class loader function
 // 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();
 
 
 // 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'])) {
        // Set the application from string
 // Does the user has an application specified?
 if (!empty($_GET['app'])) {
        // Set the application from string


@@ -45,11 +45,11 @@ if (!empty($_GET['app'])) {
                $application = trim($app[1]);
        } else {
                // Invalid entry found, first must be "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
        }
 } else {
        // Set the "application selector" application

-       $application = $cfg->readConfig('default_application');
+       $application = FrameworkConfiguration::getInstance()->readConfig('default_application');

 }
 
 // Secure it, by keeping out tags
 }
 
 // Secure it, by keeping out tags


@@ -59,15 +59,12 @@ $application = htmlentities(strip_tags($application), ENT_QUOTES);
 $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 
 // Set the application name for later usage
 $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?
  */
 
 /**
  * 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
         */
        /**
         * Load all development includes
         */