Constants PATH and _DB_TYPE replaced

[shipsimu.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index dc603cad1b060c5f73cddbbb1e193e78edc407b5..54bd39be01546f744b9cb064b576ab3cc833377f 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -4,9 +4,9 @@
  *
  * @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, this is free software
  * @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
@@ -26,17 +26,17 @@
 $cfg = FrameworkConfiguration::getInstance();
 
 // Include the class loader function
-require(sprintf("%sinc/loader/class_ClassLoader%s", PATH, $cfg->readConfig('php_extension')));
+require(sprintf("%sinc/loader/class_ClassLoader%s", $cfg->readConfig('base_path'), $cfg->readConfig('php_extension')));
 
 // Does the user has an application specified?
-if (!empty($_GET[$cfg->readConfig('app_selector_get')])) {
+if (!empty($_GET['app'])) {
        // Set the application from string
-       $application = (string) $_GET[$cfg->readConfig('app_selector_get')];
+       $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] == $cfg->readConfig('app_selector_get')) {
+       if ($app[0] == 'app') {
                // Application is valid!
                $application = trim($app[1]);
        } else {
@@ -52,7 +52,7 @@ if (!empty($_GET[$cfg->readConfig('app_selector_get')])) {
 $application = htmlentities(strip_tags($application), ENT_QUOTES);
 
 // Secure it a little more with a reg.exp.
-$application = preg_replace('/([^a-z_-])+/i', "", $application);
+$application = preg_replace('/([^a-z0-9_-])+/i', "", $application);
 
 // Set the application name for later usage
 $cfg->setConfigEntry('app_name', $application);
@@ -71,7 +71,7 @@ function __autoload ($className) {
 /**
  * Is the devel package included?
  */
-if (is_dir(sprintf("%sdevel", PATH))) {
+if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {
        /**
         * Load all development includes
         */