Rewritten a lot double-quotes to single-requotes, removed deprecated exception, some...

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

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index aa00607c0d3b91a242febd70c55f8a342fb34c56..5d47232ca4bdcee9f7b5d65303e1091125628ee3 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -109,9 +109,9 @@ class FrameworkConfiguration implements Registerable {
                                        $fqfn = $inc;
 
                                        // Base path added? (Uni* / Windows)
-                                       if ((substr($inc, 0, 1) != "/") && (substr($inc, 1, 1) != ":")) {
+                                       if ((substr($inc, 0, 1) != '/') && (substr($inc, 1, 1) != ':')) {
                                                // Generate FQFN
-                                               $fqfn = sprintf("%s/inc/extra/%s", $this->readConfig('base_path'), $inc);
+                                               $fqfn = $this->readConfig('base_path') . '/inc/extra/' . $inc;
                                        } // END - if
                                } // END - if
 
@@ -143,11 +143,6 @@ class FrameworkConfiguration implements Registerable {
                        throw new ConfigEntryNotFoundException(array(__CLASS__, $cfgEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
                }
 
-               // Debug message
-               if ((defined('DEBUG_CONFIG')) || (defined('DEBUG_ALL'))) {
-                       echo "[".__METHOD__."] Configuration entry ".$cfgEntry." requested.<br />\n";
-               } // END - if
-
                // Return the requested value
                return $this->config[$cfgEntry];
        }
@@ -194,16 +189,16 @@ class FrameworkConfiguration implements Registerable {
         */
        public function detectBaseUrl() {
                // Initialize the URL
-               $baseUrl = "http";
+               $baseUrl = 'http';
 
                // Do we have HTTPS?
                if (isset($_SERVER['HTTPS'])) {
                        // Add the >s< for HTTPS
-                       $baseUrl .= "s";
+                       $baseUrl .= 's';
                } // END - if
 
-               // Construct the full URL now and secure it against CSRF attacks
-               $baseUrl = $baseUrl . "://" . $this->detectDomain() . $this->detectScriptPath();
+               // Construct the full URL and secure it against CSRF attacks
+               $baseUrl = $baseUrl . '://' . $this->detectDomain() . $this->detectScriptPath();
 
                // Return the URL
                return $baseUrl;
@@ -216,7 +211,7 @@ class FrameworkConfiguration implements Registerable {
         */
        public function detectDomain () {
                // Full domain is localnet.invalid by default
-               $fullDomain = "localnet.invalid";
+               $fullDomain = 'localnet.invalid';
 
                // Is the server name there?
                if (isset($_SERVER['SERVER_NAME'])) {
@@ -241,7 +236,7 @@ class FrameworkConfiguration implements Registerable {
                // Is the scriptname set?
                if (isset($_SERVER['SCRIPT_NAME'])) {
                        // Get dirname from it and replace back-slashes with slashes for lame OSes...
-                       $scriptPath = str_replace("\\", "/", dirname($_SERVER['SCRIPT_NAME']));
+                       $scriptPath = str_replace("\\", '/', dirname($_SERVER['SCRIPT_NAME']));
                } // END - if
 
                // Return it