Some updates:

[core.git] / framework / main / classes / output / debug / console / class_DebugConsoleOutput.php

diff --git a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
index 3b6dff705046d6c41bc8a2c2a63ec418f9f9b6a8..22a146f2531e127ade3132935a50bfedac6437a5 100644 (file)
--- a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
+++ b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
@@ -1,19 +1,25 @@
 <?php
 // Own namespace
-namespace CoreFramework\Debug\Output;
+namespace Org\Mxchange\CoreFramework\Debug\Output;
 
 // Import framework stuff
-use CoreFramework\Debug\Debugger;
-use CoreFramework\Output\Debug\BaseDebugOutput;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Stream\Output\OutputStreamer;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Debug\Debugger;
+use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
+use Org\Mxchange\CoreFramework\Output\Debug\BaseDebugOutput;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
 
 /**
  * A debug output class for the console (e.g. hub software)
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/debug/console/class_DebugConsoleOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -61,15 +67,15 @@ class DebugConsoleOutput extends BaseDebugOutput implements Debugger, OutputStre
         * @param       $stripTags      Whether HTML tags shall be stripped out
         * @return      void
         */
-       public final function outputStream ($output, $stripTags = FALSE) {
+       public final function outputStream ($output, $stripTags = false) {
                // Strip HTML tags out?
-               if ($stripTags === TRUE) {
+               if ($stripTags === true) {
                        // Prepare the output without HTML tags
                        $output = trim(html_entity_decode(strip_tags(stripslashes($output))));
                } // END - if
 
                // Are debug times enabled?
-               if ($this->getConfigInstance()->getConfigEntry('debug_' . self::getResponseTypeFromSystem() . '_output_timings') == 'Y') {
+               if ($this->getConfigInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_output_timings') == 'Y') {
                        // Output it first
                        $output = $this->getPrintableExecutionTime() . $output;
                } // END - if
@@ -85,9 +91,9 @@ class DebugConsoleOutput extends BaseDebugOutput implements Debugger, OutputStre
         * @param       $stripTags      Whether HTML tags shall be stripped out
         * @return      void
         */
-       public final function output ($outStream = FALSE, $stripTags = FALSE) {
+       public final function output ($outStream = false, $stripTags = false) {
                // Empty output will be silently ignored
-               if ($outStream !== FALSE) {
+               if ($outStream !== false) {
                        $this->outputStream($outStream, $stripTags);
                } // END - if
        }