should be more encapsulated (abstracted)

[core.git] / inc / classes / main / response / http / class_HttpResponse.php

diff --git a/inc/classes/main/response/http/class_HttpResponse.php b/inc/classes/main/response/http/class_HttpResponse.php
index 0bd0ff2dff2fab19fc21fb1cb55998195cfeaa5c..5822f1efdbb26bae0c21325eb3951f7a3bf7b47e 100644 (file)
--- a/inc/classes/main/response/http/class_HttpResponse.php
+++ b/inc/classes/main/response/http/class_HttpResponse.php
@@ -90,6 +90,8 @@ class HttpResponse extends BaseResponse implements Responseable {
 
                // Shall we encrypt the cookie?
                if ($encrypted === true) {
+                       // Unsupported at the moment
+                       $this->partialStub('Encryption is unsupported at the moment.');
                } // END - if
 
                // For slow browsers set the cookie array element first
@@ -97,11 +99,11 @@ class HttpResponse extends BaseResponse implements Responseable {
 
                // Get all config entries
                if (is_null($expires)) {
-                       $expires = (time() + $this->getConfigInstance()->readConfig('cookie_expire'));
+                       $expires = (time() + $this->getConfigInstance()->getConfigEntry('cookie_expire'));
                } // END - if
 
-               $path = $this->getConfigInstance()->readConfig('cookie_path');
-               $domain = $this->getConfigInstance()->readConfig('cookie_domain');
+               $path = $this->getConfigInstance()->getConfigEntry('cookie_path');
+               $domain = $this->getConfigInstance()->getConfigEntry('cookie_domain');
 
                setcookie($cookieName, $cookieValue, $expires);
                //, $path, $domain, (isset($_SERVER['HTTPS']))
@@ -109,7 +111,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 
                // Now construct the full header
                $cookieString = $cookieName . '=' . $cookieValue . '; ';
-               $cookieString .= "expires=" . date("D, d-F-Y H:i:s", $expires) . " GMT";
+               $cookieString .= 'expires=' . date('D, d-F-Y H:i:s', $expires) . ' GMT';
                // $cookieString .= "; path=".$path."; domain=".$domain;
 
                // Set the cookie as a header
@@ -135,7 +137,7 @@ class HttpResponse extends BaseResponse implements Responseable {
                $this->getTemplateInstance()->assignApplicationData($this->getApplicationInstance());
 
                // Get the url from config
-               $url = $this->getConfigInstance()->readConfig($configEntry . "_url");
+               $url = $this->getConfigInstance()->getConfigEntry($configEntry . '_url');
 
                // Compile the URL
                $url = $this->getTemplateInstance()->compileRawCode($url);
@@ -146,7 +148,7 @@ class HttpResponse extends BaseResponse implements Responseable {
                        if (substr($url, 0, 1) == '/') $url = substr($url, 1);
 
                        // No, then extend it with our base URL
-                       $url = $this->getConfigInstance()->readConfig('base_url') . '/' . $url;
+                       $url = $this->getConfigInstance()->getConfigEntry('base_url') . '/' . $url;
                } // END - if
 
                // Add redirect header
@@ -202,7 +204,7 @@ class HttpResponse extends BaseResponse implements Responseable {
         * @return      $defaultCommand         Default command for this response
         */
        public function getDefaultCommand () {
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command');
+               $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_web_command');
                return $defaultCommand;
        }
 }