Payment introduced, minor rewrites

[shipsimu.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 52f859473f78adc4d6fbeff9ff0760ba8c983573..7e3f5c9ffc6bf37b059d87261772ff30b4e29bc6 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -2,11 +2,11 @@
 /**
  * Loads more include files by using the generic class loader
  *
 /**
  * Loads more include files by using the generic class loader
  *

- * @author             Roland Haeder <webmaster@mxchange.org>
+ * @author             Roland Haeder <webmaster@ship-simu.org>

  * @version            0.0.0
  * @version            0.0.0

- * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software

  * @license            GNU GPL 3.0 or any newer version
  * @license            GNU GPL 3.0 or any newer version

- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.org

  *
  * 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
  *
  * 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


@@ -22,17 +22,60 @@
  * 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%s", PATH, FrameworkConfiguration::getInstance()->readConfig("php_extension")));
+require(sprintf("%sinc/loader/class_ClassLoader.php", $cfg->readConfig('base_path')));
+
+// Does the user has an application specified?
+if (!empty($_GET['app'])) {
+       // Set the application from string
+       $application = (string) $_GET['app'];
+} elseif (!empty($_SERVER['argv'][1])) {
+       // Set the application from string
+       $application = (string) $_SERVER['argv'][1];
+       $app = explode('=', trim($application));
+       if ($app[0] == 'app') {
+               // Application is valid!
+               $application = trim($app[1]);
+       } else {
+               // Invalid entry found, first must be "app"!
+               $application = $cfg->readConfig('default_application');
+       }
+} else {
+       // Set the "application selector" application
+       $application = $cfg->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);
+
+// 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?
  */
 
 /**
  * Is the devel package included?
  */

-if (is_dir(sprintf("%sdevel", PATH))) {
+if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {

        /**
         * Load all development includes
         */
        /**
         * Load all development includes
         */

-       ClassLoader::getInstance()->loadClasses("devel");
+       ClassLoader::getInstance()->loadClasses('devel');

 }
 
 // Shall we include additional configs where you can configure some things? Then
 }
 
 // Shall we include additional configs where you can configure some things? Then