should be more encapsulated (abstracted)

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

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 85da3032725ef2bad673906d1d7e45aea99252a1..7692132a1941dc9647206660909182360d510454 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -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
@@ -111,7 +113,7 @@ class FrameworkConfiguration implements Registerable {
                                        // Base path added? (Uni* / Windows)
                                        if ((substr($inc, 0, 1) != '/') && (substr($inc, 1, 1) != ':')) {
                                                // Generate FQFN
-                                               $fqfn = $this->readConfig('base_path') . '/inc/extra/' . $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;
 
@@ -182,17 +184,64 @@ 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';
 
                // Do we have HTTPS?
-               if (isset($_SERVER['HTTPS'])) {
+               if ($this->isHttpSecured()) {
                        // Add the >s< for HTTPS
                        $baseUrl .= 's';
                } // END - if