* become registered with this middleware because the back-fall class will
* become deprecated soon.
*
- * @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 - 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 concrete output instance
*/
- private $outputInstance = null;
+ private $outputInstance = NULL;
/**
* An instance of this class
*/
- private static $thisInstance = null;
+ private static $selfInstance = NULL;
/**
* Protected constructor
parent::__construct(__CLASS__);
// Set own instance
- self::$thisInstance = $this;
+ self::$selfInstance = $this;
// Set it so all can use it
$this->setDebugInstance($this);
* If no output is given this class is currently being used for back-fall.
* This fall-back mechanism will become deprecated very soon.
*
- * @param $debuggerClass The class name which we shall use for
+ * @param $outputClass The class name which we shall use for
* registering the *real* debug output
+ * @param $className Class where a output should be created and
+ * configured for
* @return $debugInstance An instance of this middleware class
*/
- public final static function createDebugMiddleware ($debuggerClass) {
+ public static final function createDebugMiddleware ($outputClass, $className) {
+ //* DEBUG-DIE: */ die(__METHOD__.': outputClass=' . $outputClass . ',className=' . $className);
+
// Create an instance if this middleware
$debugInstance = new DebugMiddleware();
+ // Default is that $outputClass may be invalid
+ $isInitialized = FALSE;
+
// Is there a valid output instance provided?
- if ((!is_null($debuggerClass)) && (is_object($debuggerClass)) && ($debuggerClass instanceof OutputStreamer)) {
+ if ((!is_null($outputClass)) && (is_object($outputClass)) && ($outputClass instanceof OutputStreamer)) {
// Use the given output instance
- $debugInstance->setOutputInstance($debuggerClass);
- } elseif ((!is_null($debuggerClass)) && (is_string($debuggerClass)) && (class_exists($debuggerClass))) {
+ $debugInstance->setOutputInstance($outputClass);
+
+ // All fine
+ $isInitialized = TRUE;
+ } elseif ((!is_null($outputClass)) && (is_string($outputClass)) && (class_exists($outputClass))) {
// A name for a debug output class has been provided so we try to get it
- $debuggerInstance = ObjectFactory::createObjectByName($debuggerClass);
+ $outputInstance = ObjectFactory::createObjectByName($outputClass);
// Set this as output class
- $debugInstance->setOutputInstance($debuggerInstance);
+ $debugInstance->setOutputInstance($outputInstance);
+
+ // All fine
+ $isInitialized = TRUE;
}
+ // Is the output class initialized?
+ if ($isInitialized === TRUE) {
+ // Then set class name
+ $debugInstance->getOutputInstance()->setLoggerClassName($className);
+ } // END - if
+
// Return instance
return $debugInstance;
}
/**
* Getter for an instance of this class
*
- * @return $thisInstance An instance of this class
+ * @return $selfInstance An instance of this class
*/
- public final static function getInstance() {
- return self::$thisInstance;
+ public static final function getSelfInstance() {
+ return self::$selfInstance;
}
/**
* output instance.
*
* @param $outStream Data we shall 'stream' out to the world
+ * @param $stripTags Whether HTML tags shall be stripped out
* @return void
*/
- public final function output ($outStream) {
+ public final function output ($outStream, $stripTags = FALSE) {
// Is the output stream set
if (empty($outStream)) {
// @TODO Initialization phase
} // END - if
// Use the output instance
- $this->outputInstance->outputStream($outStream);
+ $this->outputInstance->outputStream($outStream, $stripTags);
}
}