X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=7692132a1941dc9647206660909182360d510454;hp=aa00607c0d3b91a242febd70c55f8a342fb34c56;hb=73bb9000fb82cfb51d3e55f0d1f7f6d09974368e;hpb=3107989f93cfb5808ce9d75f1c7d2b7ee3d83d18

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index aa00607c..7692132a 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -8,7 +8,7 @@
  * @see			ClassLoader
  * @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
  *
@@ -74,8 +74,8 @@ class FrameworkConfiguration implements Registerable {
 	 */
 	public final function setDefaultTimezone ($zone) {
 		// At least 5.1.0 is required for this!
-		if (version_compare(phpversion(), "5.1.0")) {
-			@date_default_timezone_set($zone);
+		if (version_compare(phpversion(), '5.1.0')) {
+			date_default_timezone_set($zone);
 		} // END - if
 	}
 
@@ -87,7 +87,7 @@ class FrameworkConfiguration implements Registerable {
 		$enableQuotes = (boolean) $enableQuotes;
 
 		// Set it
-		@set_magic_quotes_runtime($enableQuotes);
+		set_magic_quotes_runtime($enableQuotes);
 	}
 
 	/**
@@ -95,6 +95,8 @@ class FrameworkConfiguration implements Registerable {
 	 *
 	 * @param	$arrayObject	The array object with all include files
 	 * @return	void
+	 * @deprecated
+	 * @see		ClassLoader
 	 */
 	private function loadIncludes (ArrayObject $arrayObject) {
 		// Load only if there are includes defined
@@ -109,9 +111,9 @@ class FrameworkConfiguration implements Registerable {
 					$fqfn = $inc;
 
 					// Base path added? (Uni* / Windows)
-					if ((substr($inc, 0, 1) != "/") && (substr($inc, 1, 1) != ":")) {
+					if ((substr($inc, 0, 1) != '/') && (substr($inc, 1, 1) != ':')) {
 						// Generate FQFN
-						$fqfn = sprintf("%s/inc/extra/%s", $this->readConfig('base_path'), $inc);
+						$fqfn = $this->getConfigEntry('base_path') . '/inc/extra/' . $inc;
 					} // END - if
 				} // END - if
 
@@ -130,7 +132,7 @@ class FrameworkConfiguration implements Registerable {
 	 * @throws	ConfigEntryNotFoundException	If a configuration element
 	 *											was not found
 	 */
-	public function readConfig ($cfgEntry) {
+	public function getConfigEntry ($cfgEntry) {
 		// Cast to string
 		$cfgEntry = (string) $cfgEntry;
 
@@ -143,11 +145,6 @@ class FrameworkConfiguration implements Registerable {
 			throw new ConfigEntryNotFoundException(array(__CLASS__, $cfgEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
 		}
 
-		// Debug message
-		if ((defined('DEBUG_CONFIG')) || (defined('DEBUG_ALL'))) {
-			echo "[".__METHOD__."] Configuration entry ".$cfgEntry." requested.<br />\n";
-		} // END - if
-
 		// Return the requested value
 		return $this->config[$cfgEntry];
 	}
@@ -187,23 +184,70 @@ class FrameworkConfiguration implements Registerable {
 		return get_class($this);
 	}
 
+	/**
+	 * Setter for SERVER_ADDR
+	 *
+	 * @param	$serverAddress	New SERVER_ADDR value to set
+	 * @return	void
+	 */
+	public function setServerAddress ($serverAddress) {
+		$this->setConfigEntry('server_addr', (string) $serverAddress);
+	}
+
+	/**
+	 * Getter for SERVER_ADDR
+	 *
+	 * @return	$serverAddress	New SERVER_ADDR value to set
+	 */
+	public function getServerAddress () {
+		return $this->getConfigEntry('server_addr');
+	}
+
+	/**
+	 * Detects the HTTPS flag
+	 *
+	 * @return	$https	The detected HTTPS flag or null if failed
+	 */
+	public function detectHttpSecured () {
+		// Default is null
+		$https = null;
+
+		// Is HTTPS set?
+		if ($this->isHttpSecured()) {
+			// Then use it
+			$https = $_SERVER['HTTPS'];
+		} // END - if
+
+		// Return it
+		return $https;
+	}
+
+	/**
+	 * Checks wether HTTPS is set in $_SERVER
+	 *
+	 * @return $isset	Wether HTTPS is set
+	 */
+	public function isHttpSecured () {
+		return (isset($_SERVER['HTTPS']));
+	}
+
 	/**
 	 * Dectect and return the base URL for all URLs and forms
 	 *
 	 * @return	$baseUrl	Detected base URL
 	 */
-	public function detectBaseUrl() {
+	public function detectBaseUrl () {
 		// Initialize the URL
-		$baseUrl = "http";
+		$baseUrl = 'http';
 
 		// Do we have HTTPS?
-		if (isset($_SERVER['HTTPS'])) {
+		if ($this->isHttpSecured()) {
 			// Add the >s< for HTTPS
-			$baseUrl .= "s";
+			$baseUrl .= 's';
 		} // END - if
 
-		// Construct the full URL now and secure it against CSRF attacks
-		$baseUrl = $baseUrl . "://" . $this->detectDomain() . $this->detectScriptPath();
+		// Construct the full URL and secure it against CSRF attacks
+		$baseUrl = $baseUrl . '://' . $this->detectDomain() . $this->detectScriptPath();
 
 		// Return the URL
 		return $baseUrl;
@@ -216,7 +260,7 @@ class FrameworkConfiguration implements Registerable {
 	 */
 	public function detectDomain () {
 		// Full domain is localnet.invalid by default
-		$fullDomain = "localnet.invalid";
+		$fullDomain = 'localnet.invalid';
 
 		// Is the server name there?
 		if (isset($_SERVER['SERVER_NAME'])) {
@@ -241,7 +285,7 @@ class FrameworkConfiguration implements Registerable {
 		// Is the scriptname set?
 		if (isset($_SERVER['SCRIPT_NAME'])) {
 			// Get dirname from it and replace back-slashes with slashes for lame OSes...
-			$scriptPath = str_replace("\\", "/", dirname($_SERVER['SCRIPT_NAME']));
+			$scriptPath = str_replace("\\", '/', dirname($_SERVER['SCRIPT_NAME']));
 		} // END - if
 
 		// Return it