Removed deprecated scripts (please delete them even if you get conflicts)

[core.git] / inc / config / class_FrameworkConfiguration.php

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 938b67ba99c954a1265b1e44dedf1be577554eee..bebc1cdea119be80780ad8f1d25e93c9a13ba513 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -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
@@ -100,10 +103,10 @@ class FrameworkConfiguration implements Registerable {
        }
 
        /**
-        * Checks wether the given configuration entry is set
+        * Checks whether the given configuration entry is set
         *
         * @param       $configEntry    The configuration entry we shall check
-        * @return      $isset                  Wether the given configuration entry is set
+        * @return      $isset                  Whether the given configuration entry is set
         */
        protected function isConfigurationEntrySet ($configEntry) {
                // Is it set?
@@ -230,9 +233,9 @@ class FrameworkConfiguration implements Registerable {
        }
 
        /**
-        * Checks wether HTTPS is set in $_SERVER
+        * Checks whether HTTPS is set in $_SERVER
         *
-        * @return $isset       Wether HTTPS is set
+        * @return $isset       Whether HTTPS is set
         */
        public function isHttpSecured () {
                return (isset($_SERVER['HTTPS']));
@@ -320,11 +323,11 @@ class FrameworkConfiguration implements Registerable {
        }
 
        /**
-        * Checks wether an object equals this object. You should overwrite this
+        * Checks whether an object equals this object. You should overwrite this
         * method to implement own equality checks
         *
         * @param       $objectInstance         An instance of a FrameworkInterface object
-        * @return      $equals                         Wether both objects equals
+        * @return      $equals                         Whether both objects equals
         */
        public function equals (FrameworkInterface $objectInstance) {
                // Now test it