X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresponse%2Fhttp%2Fclass_HttpResponse.php;h=a3e5e362033c750a247cc3fba3a37e79899135db;hp=19a453bb52348741e67856402edc84b6dedc2b49;hb=a3fa89c7cbc54491fc74f13db0927d14acf550c8;hpb=3107989f93cfb5808ce9d75f1c7d2b7ee3d83d18

diff --git a/inc/classes/main/response/http/class_HttpResponse.php b/inc/classes/main/response/http/class_HttpResponse.php
index 19a453bb..a3e5e362 100644
--- a/inc/classes/main/response/http/class_HttpResponse.php
+++ b/inc/classes/main/response/http/class_HttpResponse.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -41,7 +41,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 	 * @param	$appInstance		An instance of a manageable application
 	 * @return	$responseInstance	A prepared instance of this class
 	 */
-	public final static function createHttpResponse (ManageableApplication $appInstance) {
+	public static final function createHttpResponse (ManageableApplication $appInstance) {
 		// Get a new instance
 		$responseInstance = new HttpResponse();
 
@@ -80,7 +80,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 	 * @todo	this will send only one cookie out, the first one.
 	 */
 	public function addCookie ($cookieName, $cookieValue, $encrypted = false, $expires = null) {
-		//* DEBUG: */ echo $cookieName."=".$cookieValue."<br />\n";
+		//* DEBUG: */ echo $cookieName.'='.$cookieValue."<br />\n";
 		// Are headers already sent?
 		if (headers_sent()) {
 			// Throw an exception here
@@ -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,19 +99,19 @@ 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']))
 		return;
 
 		// Now construct the full header
-		$cookieString = $cookieName . "=" . $cookieValue . "; ";
-		$cookieString .= "expires=" . date("D, d-F-Y H:i:s", $expires) . " GMT";
+		$cookieString = $cookieName . '=' . $cookieValue . '; ';
+		$cookieString .= 'expires=' . date('D, d-F-Y H:i:s', $expires) . ' GMT';
 		// $cookieString .= "; path=".$path."; domain=".$domain;
 
 		// Set the cookie as a header
@@ -135,25 +137,25 @@ 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);
 
-		// Do we have a "http" in front of the URL?
-		if (substr(strtolower($url), 0, 4) != "http") {
+		// Do we have a 'http' in front of the URL?
+		if (substr(strtolower($url), 0, 4) != 'http') {
 			// Is there a / in front of the relative URL?
-			if (substr($url, 0, 1) == "/") $url = substr($url, 1);
+			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
-		$this->addHeader("Location", $url);
+		$this->addHeader('Location', str_replace('&amp;', '&', $url));
 
 		// Set correct response status
-		$this->setResponseStatus("301 Moved Permanently");
+		$this->setResponseStatus('301 Moved Permanently');
 
 		// Clear the body
 		$this->setResponseBody('');
@@ -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;
 	}
 }