X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fincludes.php;h=54bd39be01546f744b9cb064b576ab3cc833377f;hb=8ff12f905898b0c2b7ff8124c9749ad6fb9c44f3;hp=c7a949aacb1b44768ec9a871ba2095fd7e7ea152;hpb=4fdcba4d4a450cf1b8ab23cecd9b9dcdb5d934c6;p=shipsimu.git

diff --git a/inc/includes.php b/inc/includes.php
index c7a949a..54bd39b 100644
--- 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
@@ -21,8 +21,41 @@
  * You should have received a copy of the GNU General Public License
  * 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%s", PATH, FrameworkConfiguration::getInstance()->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['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
@@ -38,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
 	 */