Copyright year updated, converted double->single quotes

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

diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php
index 544cd23ba7729493ab2b7ac3e53ea30ff3c79976..6e0e164d2e4fc7f3f05e62d5054567def77dc672 100644 (file)
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.php
@@ -3,11 +3,11 @@
  * 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, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 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
@@ -26,7 +26,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
        /**
         * The instance for the singleton design pattern
         */
-       private static $consoleInstance = null;
+       private static $consoleInstance = NULL;
 
        /**
         * Protected constructor
@@ -70,10 +70,13 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * @return      $consoleInstance        An instance of this class
         */
        public static final function getInstance() {
+               // Is the self-instance already set?
                if (is_null(self::$consoleInstance)) {
-                       $contentType = FrameworkConfiguration::getInstance()->getConfigEntry('web_content_type');
+                       $contentType = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_content_type');
                        self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
-               }
+               } // END - if
+
+               // Return the instance
                return self::$consoleInstance;
        }
 
@@ -81,10 +84,11 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * 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) {
-               print trim($outStream) . "\n";
+       public final function output ($outStream = FALSE, $stripTags = FALSE) {
+               print trim($outStream) . PHP_EOL;
        }
 }