From 4e22287c2a440ded1bd9fb1c9908a19ec710c4d1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 21 Aug 2009 17:55:44 +0000
Subject: [PATCH] WebOutput now needs a ManageableApplication instance

---
 inc/classes/main/output/class_WebOutput.php | 35 ++++++---------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/inc/classes/main/output/class_WebOutput.php b/inc/classes/main/output/class_WebOutput.php
index 14b82833..31345695 100644
--- a/inc/classes/main/output/class_WebOutput.php
+++ b/inc/classes/main/output/class_WebOutput.php
@@ -41,44 +41,29 @@ class WebOutput extends BaseFrameworkSystem implements OutputStreamer, Registera
 	/**
 	 * Create a new web output system and set the content type
 	 *
-	 * @param		$contentType		A valid content-type
-	 * @return	$debugInstance		An instance of this middleware class
+	 * @param	$applicationInstance	An instance of a ManageableApplication class
+	 * @return	$debugInstance			An instance of this middleware class
 	 */
-	public final static function createWebOutput ($contentType) {
+	public final static function createWebOutput (ManageableApplication $applicationInstance) {
 		// Is there no instance?
 		if (is_null(self::$webInstance)) {
-			// Cast the content-type to string and trim it
-			$contentType = (string) $contentType;
-			$contentType = trim($contentType);
+			// Get a new instance and set it
+			self::$webInstance = new WebOutput();
+
+			// Get the content type
+			$contentType = self::$webInstance->getConfigInstance()->getConfigEntry('web_content_type');
 
 			// Set the content type
-			// @TODO Need to rewrite this to $requestInstance->addHeader()
 			if (!empty($contentType)) {
-				@header(sprintf("Content-type: %s",
-					$contentType
-				));
+				// Set the header
+				$applicationInstance->getResponseInstance()->addHeader('Content-type', $contentType);
 			} // END - if
-
-			// Get a new instance and set it
-			self::$webInstance = new WebOutput();
 		} // END - if
 
 		// Return instance
 		return self::$webInstance;
 	}
 
-	/**
-	 * Assigns a variable for output
-	 *
-	 * @param		$var		The variable we shall assign
-	 * @param		$value	The value to store in the variable
-	 * @return	void
-	 */
-	public function assignVariable($var, $value) {
-		// Stub message because we don't have it here
-		trigger_error(__METHOD__.": Stub!");
-	}
-
 	/**
 	 * Output the code
 	 *
-- 
2.39.5