Added new general I/O stream classes and interfaces. Still the interfaces have no...

[core.git] / inc / classes / main / output / class_WebOutput.php

diff --git a/inc/classes/main/output/class_WebOutput.php b/inc/classes/main/output/class_WebOutput.php
index adbf50c510045a5c00b03f0b7062b54e32ae5d65..ff175d0bd10ba137d914b234fdefd5856ccb850d 100644 (file)
--- a/inc/classes/main/output/class_WebOutput.php
+++ b/inc/classes/main/output/class_WebOutput.php
@@ -5,7 +5,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 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -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) {
-               // Is there no instance?
+       public static final function createWebOutput (ManageableApplication $applicationInstance) {
+               // Is the self-instance already set?
                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
         *