* This class simply puts text without any HTML code out. This class is suiable
* for console output
*
- * @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 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
/**
* The instance for the singleton design pattern
*/
- private static $consoleInstance = null;
-
- /**
- * Assigned variables
- */
- private $vars = array();
+ private static $consoleInstance = NULL;
/**
* Protected constructor
* @param $contentType A valid content-type
* @return $debugInstance An instance of this middleware class
*/
- public final static function createConsoleOutput ($contentType) {
+ public static final function createConsoleOutput ($contentType) {
// Cast the content-type to string
$contentType = (string) $contentType;
$contentType = trim($contentType);
*
* @return $consoleInstance An instance of this class
*/
- public final static function getInstance() {
+ public static final function getInstance() {
+ // Is the self-instance already set?
if (is_null(self::$consoleInstance)) {
- $contentType = FrameworkConfiguration::getInstance()->readConfig('web_content_type');
+ $contentType = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_content_type');
self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
- }
+ } // END - if
+
+ // Return the instance
return self::$consoleInstance;
}
* Output the code
*
* @param $outStream Something we shall sent to the console
+ * @param $stripTags Whether HTML tags shall be stripped out
* @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;
+ public final function output ($outStream = FALSE, $stripTags = FALSE) {
+ print trim($outStream) . PHP_EOL;
}
}