X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdebug%2Fclass_DebugConsoleOutput.php;h=6cd26f42ec9afa8e5c00a551661967f3e620c469;hb=b4683952aea678cf8e45d95989176073961de136;hp=bf6e0980063726a51221acc283bc0f3d45ce8b0c;hpb=c129ee85747926121abe1e2db43860121fa9b98e;p=core.git

diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php
index bf6e0980..6cd26f42 100644
--- a/inc/classes/main/debug/class_DebugConsoleOutput.php
+++ b/inc/classes/main/debug/class_DebugConsoleOutput.php
@@ -2,11 +2,11 @@
 /**
  * A debug output class for the console (e.g. hub software)
  *
- * @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 - 2011 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
@@ -49,25 +49,40 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
 	 * Outputs the given data without HTML tags
 	 *
 	 * @param	$output		The HTML'ed output
+	 * @param	$stripTags	Whether HTML tags shall be stripped out
 	 * @return	void
 	 */
-	public final function outputStream ($output) {
-		// Prepare the output
-		$output = trim(html_entity_decode(strip_tags(stripslashes($output))));
+	public final function outputStream ($output, $stripTags = FALSE) {
+		// Strip HTML tags out?
+		if ($stripTags === TRUE) {
+			// Prepare the output without HTML tags
+			$output = trim(html_entity_decode(strip_tags(stripslashes($output))));
+		} else {
+			// Prepare the output with HTML tags
+			$output = trim(stripslashes($output));
+		}
+
+		// Are debug times enabled?
+		if ($this->getConfigInstance()->getConfigEntry('debug_output_timings') == 'Y') {
+			// Output it first
+			$output = $this->getPrintableExecutionTime() . $output;
+		} // END - if
 
 		// And print it out...
-		printf("%s\n", $output);
+		printf('%s%s', $output, chr(10));
 	}
 
 	/**
 	 * Output the code
 	 *
+	 * @param	$outStream	Stream to output
+	 * @param	$stripTags	Whether HTML tags shall be stripped out
 	 * @return	void
 	 */
-	public final function output ($outStream = false) {
+	public final function output ($outStream = FALSE, $stripTags = FALSE) {
 		// Empty output will be silently ignored
-		if ($outStream !== false) {
-			$this->outputStream($outStream);
+		if ($outStream !== FALSE) {
+			$this->outputStream($outStream, $stripTags);
 		} // END - if
 	}
 
@@ -79,7 +94,7 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
 	 * @throws	UnsupportedOperationException	If this method is called
 	 */
 	public function streamData ($data) {
-		$this->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
+		self::createDebugInstance(__CLASS__)->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
 }