X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=70f0585895cc6e3ff6ae6ee89299e7e6485a56c5;hb=d73abafb0f0126fa95ca6cb76cbf6c519bc99f43;hp=0494722ee770334cd03df4917af483e4718cedcb;hpb=46a806ba2ea6443c6927242b07f39842581e0eab;p=core.git

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 0494722e..70f05858 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -51,6 +51,15 @@ class FrameworkConfiguration implements Registerable {
 		// Empty for now
 	}
 
+	/**
+	 * Compatiblity method to return this class' name
+	 *
+	 * @return	__CLASS__		This class' name
+	 */
+	public function __toString () {
+		return get_class($this);
+	}
+
 	/**
 	 * Getter for an instance of this class
 	 *
@@ -91,36 +100,17 @@ class FrameworkConfiguration implements Registerable {
 	}
 
 	/**
-	 * A private include loader
+	 * Checks wether the given configuration entry is set
 	 *
-	 * @param	$arrayObject	The array object with all include files
-	 * @return	void
-	 * @deprecated
-	 * @see		ClassLoader
+	 * @param	$configEntry	The configuration entry we shall check
+	 * @return	$isset			Wether the given configuration entry is set
 	 */
-	private function loadIncludes (ArrayObject $arrayObject) {
-		// Load only if there are includes defined
-		if (!is_null($arrayObject)) {
-			for ($idx = $arrayObject->getIterator(); $idx->valid(); $idx->next()) {
-				// Get include file
-				$inc = $idx->current();
-
-				// Is the file name really set?
-				if (!empty($inc)) {
-					// Base path is by default added
-					$fqfn = $inc;
-
-					// Base path added? (Uni* / Windows)
-					if ((substr($inc, 0, 1) != '/') && (substr($inc, 1, 1) != ':')) {
-						// Generate FQFN
-						$fqfn = $this->getConfigEntry('base_path') . '/inc/extra/' . $inc;
-					} // END - if
-				} // END - if
-
-				// Include them all here
-				require($fqfn);
-			}
-		} // END - if
+	protected function isConfigurationEntrySet ($configEntry) {
+		// Is it set?
+		$isset = isset($this->config[$configEntry]);
+
+		// Return the result
+		return $isset;
 	}
 
 	/**
@@ -140,7 +130,7 @@ class FrameworkConfiguration implements Registerable {
 		if (empty($cfgEntry)) {
 			// Entry is empty
 			throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_ENTRY_IS_EMPTY);
-		} elseif (!isset($this->config[$cfgEntry])) {
+		} elseif (!$this->isConfigurationEntrySet($cfgEntry)) {
 			// Entry was not found!
 			throw new ConfigEntryNotFoundException(array(__CLASS__, $cfgEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
 		}
@@ -176,12 +166,29 @@ class FrameworkConfiguration implements Registerable {
 	}
 
 	/**
-	 * Compatiblity method to return this class' name
+	 * Detects the server address (SERVER_ADDR) and set it in configuration
 	 *
-	 * @return	__CLASS__		This class' name
+	 * @return	$serverAddress	The detected server address
+	 * @todo	We have to add some more entries from $_SERVER here
 	 */
-	public function __toString () {
-		return get_class($this);
+	public function detectServerAddress () {
+		// Is the entry set?
+		if (!$this->isConfigurationEntrySet('server_addr')) {
+			// Is it set in $_SERVER?
+			if (isset($_SERVER['SERVER_ADDR'])) {
+				// Set it from $_SERVER
+				$this->setServerAddress($_SERVER['SERVER_ADDR']);
+			} elseif (class_exists('ConsoleTools')) {
+				// Run auto-detecting through console tools lib
+				ConsoleTools::acquireSelfIPAddress();
+			}
+		} // END - if
+
+		// Now get it from configuration
+		$serverAddress = $this->getServerAddress();
+
+		// Return it
+		return $serverAddress;
 	}
 
 	/**