X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresponse%2Fhttp%2Fclass_HttpResponse.php;h=d26b33bc21791af0216c7680db30931c5f2aa0c6;hp=1fb9f5b454d7b06e06f8bb33627448fd825c50be;hb=df2e651915deb67dc47b37943afb31298d185dc9;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a

diff --git a/inc/classes/main/response/http/class_HttpResponse.php b/inc/classes/main/response/http/class_HttpResponse.php
index 1fb9f5b4..d26b33bc 100644
--- a/inc/classes/main/response/http/class_HttpResponse.php
+++ b/inc/classes/main/response/http/class_HttpResponse.php
@@ -2,11 +2,11 @@
 /**
  * A class for an HTTP response on an HTTP request
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,18 +38,21 @@ class HttpResponse extends BaseResponse implements Responseable {
 	/**
 	 * Creates an object of this class
 	 *
-	 * @param	$appInstance		An instance of a manageable application
-	 * @return	$responseInstance	A prepared instance of this class
+	 * @param	$applicationInstance	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 $applicationInstance) {
 		// Get a new instance
 		$responseInstance = new HttpResponse();
 
 		// Set the application instance
-		$responseInstance->setApplicationInstance($appInstance);
+		$responseInstance->setApplicationInstance($applicationInstance);
 
 		// Initialize the template engine here
-		$responseInstance->initTemplateEngine($appInstance);
+		$responseInstance->initTemplateEngine($applicationInstance);
+
+		// Init web output instance
+		$responseInstance->initWebOutputInstance();
 
 		// Return the prepared instance
 		return $responseInstance;
@@ -58,11 +61,11 @@ class HttpResponse extends BaseResponse implements Responseable {
 	/**
 	 * Initializes the template engine instance
 	 *
-	 * @param	$appInstance	An instance of a manageable application
+	 * @param	$applicationInstance	An instance of a manageable application
 	 * @return	void
 	 */
-	public final function initTemplateEngine (ManageableApplication $appInstance) {
-		$this->setTemplateInstance($this->prepareTemplateInstance($appInstance));
+	public final function initTemplateEngine (ManageableApplication $applicationInstance) {
+		$this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance));
 	}
 
 	/**
@@ -79,7 +82,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 	 * @todo	If the return statement is removed and setcookie() commented out,
 	 * @todo	this will send only one cookie out, the first one.
 	 */
-	public function addCookie ($cookieName, $cookieValue, $encrypted = false, $expires = null) {
+	public function addCookie ($cookieName, $cookieValue, $encrypted = FALSE, $expires = NULL) {
 		//* DEBUG: */ echo $cookieName.'='.$cookieValue."<br />\n";
 		// Are headers already sent?
 		if (headers_sent()) {
@@ -89,7 +92,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 		} // END - if
 
 		// Shall we encrypt the cookie?
-		if ($encrypted === true) {
+		if ($encrypted === TRUE) {
 			// Unsupported at the moment
 			$this->partialStub('Encryption is unsupported at the moment.');
 		} // END - if
@@ -177,7 +180,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 		// Is the cookie there?
 		if (isset($_COOKIE[$cookieName])) {
 			// Then expire it with 20 minutes past
-			$this->addCookie($cookieName, '', false, (time() - 1200));
+			$this->addCookie($cookieName, '', FALSE, (time() - 1200));
 
 			// Remove it from array
 			unset($_COOKIE[$cookieName]);
@@ -194,7 +197,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 		// Only update existing cookies
 		if (isset($_COOKIE[$cookieName])) {
 			// Update the cookie
-			$this->addCookie($cookieName, $_COOKIE[$cookieName], false);
+			$this->addCookie($cookieName, $_COOKIE[$cookieName], FALSE);
 		} // END - if
 	}