X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=8f6fa15f45cd254137a917bb7744bd481a3974f8;hb=a2cc983f5fe910115d25800c258875a3919fb143;hp=e6d338085b1c301a99bfb4e94d9af0e40972f52a;hpb=df494d7dff1401830f34852f8bbd74b8b2913dc2;p=shipsimu.git

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index e6d3380..8f6fa15 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, 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
  *
@@ -133,14 +133,14 @@ class FrameworkConfiguration implements Registerable {
 
 				// 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 = sprintf("%s/inc/extra/%s", PATH, $inc);
-					} else {
-						// Base path is already added
-						$fqfn = $inc;
-					}
+						$fqfn = sprintf("%s/inc/extra/%s", $this->readConfig('base_path'), $inc);
+					} // END - if
 				} // END - if
 
 				// Include them all here
@@ -149,66 +149,14 @@ class FrameworkConfiguration implements Registerable {
 		} // END - if
 	}
 
-	/**
-	 * Define the database type which must be valid and will not be verified.
-	 *
-	 * @param		$type	The database type. See path inc/database/.
-	 * @return	void
-	 */
-	public function defineDatabaseType ($type) {
-		// Is it defined or not?
-		if (!defined('_DB_TYPE')) {
-			// Cast to string
-			$type = (string) $type;
-
-			// Set the constant
-			define('_DB_TYPE', $type);
-		} else {
-			// Already defined! But we cannot throw an exception here... :(
-			ApplicationEntryPoint::app_die(sprintf("[%s:] Please define the database type only once in your application!",
-				__CLASS__
-			));
-		}
-	}
-
-	/**
-	 * Define the local file path
-	 *
-	 * @param		$path	Local file path for include files.
-	 * @return	void
-	 */
-	public function definePath ($path) {
-		// Cast to string
-		$path = (string) $path;
-
-		// Replace backslashes with slashes
-		$path = str_replace("\\", "/", $path);
-
-		// Is it defined or not?
-		if ((!is_dir($path)) || (!is_readable($path))) {
-			// Is not a valid path
-			ApplicationEntryPoint::app_die(sprintf("[%s:] Invalid path (not found) specified. Please make sure it is created.",
-				__CLASS__
-			));
-		} elseif (!defined('PATH')) {
-			// Set the constant
-			define('PATH', $path);
-		} else {
-			// Already defined! But we cannot throw an exception here... :(
-			ApplicationEntryPoint::app_die(sprintf("[%s:] Please define the local file path only once in your application.",
-				__CLASS__
-			));
-		}
-	}
-
 	/**
 	 * Read a configuration element.
 	 *
-	 * @param		$cfgEntry	The configuration element
+	 * @param	$cfgEntry	The configuration element
 	 * @return	$cfgValue	The fetched configuration value
-	 * @throws	ConfigEntryIsEmptyException	If $cfgEntry is empty
+	 * @throws	ConfigEntryIsEmptyException		If $cfgEntry is empty
 	 * @throws	ConfigEntryNotFoundException	If a configuration element
-	 *									was not found
+	 *											was not found
 	 */
 	public function readConfig ($cfgEntry) {
 		// Cast to string
@@ -235,8 +183,8 @@ class FrameworkConfiguration implements Registerable {
 	/**
 	 * Set a configuration entry.
 	 *
-	 * @param		$cfgEntry	The configuration entry we want to add/change
-	 * @param		$cfgValue	The configuration value we want to set
+	 * @param	$cfgEntry	The configuration entry we want to add/change
+	 * @param	$cfgValue	The configuration value we want to set
 	 * @return	void
 	 * @throws	ConfigEntryIsEmptyException	If $cfgEntry is empty
 	 */
@@ -295,13 +243,40 @@ class FrameworkConfiguration implements Registerable {
 	 * @return	$fullDomain		The detected full domain
 	 */
 	public function detectDomain () {
-		// Detect the full domain
-		$fullDomain = htmlentities(strip_tags($_SERVER['SERVER_NAME']), ENT_QUOTES);
+		// Full domain is localnet.invalid by default
+		$fullDomain = "localnet.invalid";
+
+		// Is the server name there?
+		if (isset($_SERVER['SERVER_NAME'])) {
+			// Detect the full domain
+			$fullDomain = htmlentities(strip_tags($_SERVER['SERVER_NAME']), ENT_QUOTES);
+		} // END - if
 
 		// Return it
 		return $fullDomain;
 	}
-} // END - class
+
+	/**
+	 * Getter for field name
+	 *
+	 * @param	$fieldName		Field name which we shall get
+	 * @return	$fieldValue		Field value from the user
+	 */
+	function getField ($fieldName) {
+		// Dummy method!
+	}
+
+	/**
+	 * Updates a given field with new value
+	 *
+	 * @param	$fieldName		Field to update
+	 * @param	$fieldValue		New value to store
+	 * @return	void
+	 */
+	public function updateDatabaseField ($fieldName, $fieldValue) {
+		// Dummy method!
+	}
+}
 
 // [EOF]
 ?>