X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=96338267adb4d54441d2007c7bff657c441b6610;hp=ad7bfafd588c9bd05c5dc4805705741b039b1185;hb=db61178ebaf96aa11cc16f18af4fedaaf32fe2de;hpb=9aa87152298f44bf6ed5a50e952fbae993a46c3a

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index ad7bfaf..9633826 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -218,7 +218,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$this->resetUniqueID();
 		} elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
 			// Already destructed object
-			$this->getDebugInstance()->output(sprintf("[%s:] The object <strong>%s</strong> is already destroyed.",
+			$this->debugOutput(sprintf("[%s:] The object <strong>%s</strong> is already destroyed.",
 				__CLASS__, $this->__toString()
 			));
 		}
@@ -285,7 +285,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		}
 
 		// Output stub message
-		$this->getDebugInstance()->output(sprintf("[%s-&gt;%s] Stub! Args: %s",
+		$this->debugOutput(sprintf("[%s-&gt;%s] Stub! Args: %s",
 			$this->__toString(),
 			$methodName,
 			$argsString
@@ -480,11 +480,16 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$dbInstance	The database layer instance
 	 */
 	public final function getDatabaseInstance () {
+		// Default is invalid db instance
+		$dbInstance = null;
+
+		// Is the registry there and initialized?
 		if ((class_exists('Registry')) && (Registry::isInitialized() === true)) {
-			return Registry::getRegistry()->getInstance('dbInstance');
-		} else {
-			return null;
-		}
+			$dbInstance = Registry::getRegistry()->getInstance('dbInstance');
+		} // END - if
+
+		// Return instance
+		return $dbInstance;
 	}
 
 	/**
@@ -721,11 +726,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$objectDescription	The description of this simulation part
 	 */
 	public final function getObjectDescription () {
-		if (isset($this->objectDescription)) {
-			return $this->objectDescription;
-		} else {
-			return null;
-		}
+		return $this->objectDescription;
 	}
 
 	/**
@@ -750,7 +751,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 	/**
 	 * Compare if both simulation part description and class name matches
-	 * (shall be enougth)
+	 * (shall be enough)
 	 *
 	 * @param	$itemInstance	An object instance to an other class
 	 * @return	boolean			The result of comparing class name simulation part description
@@ -956,8 +957,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			if (is_null($appInstance)) {
 				// Thrown an exception
 				throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-			}
-		}
+			} // END - if
+		} // END - if
 
 		// Generate FQFN for all application templates
 		$fqfn = sprintf("%s%s/%s/%s",
@@ -989,13 +990,20 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	void
 	 */
 	public final function debugInstance () {
+		// Restore the error handler to avoid trouble with missing array elements or undeclared variables
+		restore_error_handler();
+
 		// Generate the output
 		$content = sprintf("<pre>%s</pre>",
-			trim(print_r($this, true))
+			trim(
+				htmlentities(
+					print_r($this, true)
+				)
+			)
 		);
 
 		// Output it
-		ApplicationEntryPoint::app_die(sprintf("<strong>%s debug output:</strong><div id=\"debug_content\">%s</div>Loaded includes: <div id=\"debug_include_list\">%s</div>",
+		ApplicationEntryPoint::app_die(sprintf("<strong>%s debug output:</strong><div id=\"debug_content\">%s</div>\nLoaded includes: <div id=\"debug_include_list\">%s</div>",
 			$this->__toString(),
 			$content,
 			ClassLoader::getInstance()->getPrintableIncludeList()
@@ -1016,7 +1024,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		$methodName = "UnknownClass-&gt;unknownMethod";
 		if ((isset($backtrace[1]['class'])) && (isset($backtrace[1]['function']))) {
 			$methodName = $backtrace[1]['class']."-&gt;".$backtrace[1]['function'];
-		}
+		} // END - if
 
 		// Construct the full message
 		$stubMessage = sprintf("[%s:] Partial stub!",
@@ -1027,12 +1035,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		if (!empty($message)) {
 			// Then add it as well
 			$stubMessage .= sprintf(" Message: <span id=\"stub_message\">%s</span>", $message);
-		}
+		} // END - if
 
 		// Debug instance is there?
 		if (!is_null($this->getDebugInstance())) {
 			// Output stub message
-			$this->getDebugInstance()->output($stubMessage);
+			$this->debugOutput($stubMessage);
 		} else {
 			// Trigger an error
 			trigger_error($stubMessage."<br />\n");
@@ -1056,10 +1064,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * Outputs a debug message wether to debug instance (should be set!) or dies with or pints the message
 	 *
 	 * @param	$message	Message we shall send out...
-	 * @param	$doPrint	Wether we shall print or die here which last is the default
+	 * @param	$doPrint	Wether we shall print or die here which first is the default
 	 * @return	void
 	 */
-	public function debugOutput ($message, $doPrint = false) {
+	public function debugOutput ($message, $doPrint = true) {
 		// Get debug instance
 		$debugInstance = $this->getDebugInstance();
 
@@ -1070,10 +1078,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			if (!$doPrint) die(); // Die here if not printed
 		} else {
 			// Put directly out
-			// DO NOT REWRITE THIS TO app_die() !!!
 			if ($doPrint) {
 				print($message);
 			} else {
+				// DO NOT REWRITE THIS TO app_die() !!!
 				die($message);
 			}
 		}