X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=6d3b99fb9d03187b10c31ecfbf12fbed4ddbf8a7;hp=5e9b87ef93ff72aa00d7a03d858522c1f07183b4;hb=1cc728fe28f6fe71a8d581a0dc1f2505bb0baa33;hpb=1c3a46c869307f45e3c456254b086503600f8602

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 5e9b87e..6d3b99f 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -39,11 +39,13 @@ class FrameworkConfiguration implements Registerable {
 	private static $cfgInstance = null;
 
 	// Some constants for the configuration system
-	const EXCEPTION_CONFIG_ENTRY_IS_EMPTY      = 0xc00;
-	const EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND = 0xc01;
+	const EXCEPTION_CONFIG_ENTRY_IS_EMPTY      = 0x130;
+	const EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND = 0x131;
 
 	/**
 	 * Protected constructor
+	 *
+	 * @return	void
 	 */
 	protected function __construct () {
 		// Empty for now
@@ -51,6 +53,9 @@ class FrameworkConfiguration implements Registerable {
 
 	/**
 	 * "Create" a configuration instance
+	 *
+	 * @param	$enableDebug	Wether enable debug mode (default: off)
+	 * @return	$cfgInstance	An instance of this configuration class
 	 */
 	public final static function createFrameworkConfiguration ($enableDebug = false) {
 		/**
@@ -58,7 +63,7 @@ class FrameworkConfiguration implements Registerable {
 		 * through the initial configuration.
 		 */
 		if (is_null(self::$cfgInstance))  {
-			// CFG: DEBUG-LEVEL
+			// CFG: ERROR-REPORTING
 			@error_reporting(E_ALL | E_STRICT);
 
 			/**
@@ -278,11 +283,24 @@ class FrameworkConfiguration implements Registerable {
 		} // END - if
 
 		// Construct the full URL now and secure it against CSRF attacks
-		$baseUrl = $baseUrl . "://" . htmlentities(strip_tags($_SERVER['SERVER_NAME']), ENT_QUOTES) . dirname($_SERVER['SCRIPT_NAME']);
+		$baseUrl = $baseUrl . "://" . $this->detectDomain() . dirname($_SERVER['SCRIPT_NAME']);
 
 		// Return the URL
 		return $baseUrl;
 	}
+
+	/**
+	 * Detect safely and return the full domain where this script is installed
+	 *
+	 * @return	$fullDomain		The detected full domain
+	 */
+	public function detectDomain () {
+		// Detect the full domain
+		$fullDomain = htmlentities(strip_tags($_SERVER['SERVER_NAME']), ENT_QUOTES);
+
+		// Return it
+		return $fullDomain;
+	}
 } // END - class
 
 // [EOF]