X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=b3bc491fe1de8092b092a37cd390b57992f7b94f;hb=024a6bcb14515abe67fc4322595ccdca07cb1cc6;hp=c69bd5ef892a33c12572b4b63aae00c7d28b937e;hpb=83ceb6f4eb20c78b5e83842bf3bb84cd5758a647;p=core.git

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index c69bd5ef..b3bc491f 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, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -36,7 +36,7 @@ class FrameworkConfiguration implements Registerable {
 	/**
 	 * The configuration instance itself
 	 */
-	private static $configInstance = null;
+	private static $configInstance = NULL;
 
 	// Some constants for the configuration system
 	const EXCEPTION_CONFIG_ENTRY_IS_EMPTY      = 0x130;
@@ -65,7 +65,7 @@ class FrameworkConfiguration implements Registerable {
 	 *
 	 * @return	$configInstance	An instance of this class
 	 */
-	public static final function getInstance () {
+	public static final function getSelfInstance () {
 		// is the instance there?
 		if (is_null(self::$configInstance))  {
 			// Create a config instance
@@ -78,7 +78,7 @@ class FrameworkConfiguration implements Registerable {
 	/**
 	 * Setter for default time zone (must be correct!)
 	 *
-	 * @param		$zone	The time-zone string (e.g. Europe/Berlin)
+	 * @param	$zone	The time-zone string (e.g. Europe/Berlin)
 	 * @return	void
 	 */
 	public final function setDefaultTimezone ($zone) {
@@ -90,6 +90,9 @@ class FrameworkConfiguration implements Registerable {
 
 	/**
 	 * Setter for runtime magic quotes
+	 *
+	 * @param	$enableQuotes	Whether enable magic runtime quotes (should be disabled for security reasons)
+	 * @return	void
 	 */
 	public final function setMagicQuotesRuntime ($enableQuotes) {
 		// Cast it to boolean
@@ -217,7 +220,7 @@ class FrameworkConfiguration implements Registerable {
 	 */
 	public function detectHttpSecured () {
 		// Default is null
-		$https = null;
+		$https = NULL;
 
 		// Is HTTPS set?
 		if ($this->isHttpSecured()) {