X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Foutput%2Fclass_ConsoleOutput.php;h=a03b9512a76c758b1b3b8b7a8f9eb1db5eb0b0fc;hp=f149914c8e5aeee696a323f6cbc9fc20207f0592;hb=51caaa61ae7ee017abdfd116bbd8c438451315b2;hpb=49f84a522f0ccac3b70728cd41011a0be0eed8cf

diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php
index f149914c..a03b9512 100644
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.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, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -28,11 +28,6 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 */
 	private static $consoleInstance = null;
 
-	/**
-	 * Assigned variables
-	 */
-	private $vars = array();
-
 	/**
 	 * Protected constructor
 	 *
@@ -76,7 +71,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 */
 	public final static function getInstance() {
 		if (is_null(self::$consoleInstance)) {
-			$contentType = FrameworkConfiguration::getInstance()->readConfig('web_content_type');
+			$contentType = FrameworkConfiguration::getInstance()->getConfigEntry('web_content_type');
 			self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
 		}
 		return self::$consoleInstance;
@@ -89,26 +84,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 * @return	void
 	 */
 	public final function output ($outStream = false) {
-		if ($outStream === false) {
-			// Output something here...
-			foreach ($this->vars as $var => $value) {
-				$this->output("var=".$var.", value=".$value.'');
-			}
-		} else {
-			// Output it to the console
-			printf("%s\n", trim(html_entity_decode(strip_tags(stripslashes($outStream)))));
-		}
-	}
-
-	/**
-	 * 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) {
-		$this->vars[$var] = $value;
+		print trim($outStream) . "\n";
 	}
 }