X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=3c9dcb2873050c9944189a95a908fdae6ec95071;hb=a1362d15b7639c7ae2228c020d94ba98c9448ea0;hp=34c10efe4aae4054f3fc3a71a176eabcd141d902;hpb=e2223f8fd92a3f8c7ae947e195f166b87cbb6413;p=core.git

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 34c10efe..3c9dcb28 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -169,12 +169,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	private $wrapperInstance = NULL;
 
 	/**
-	 * Thousands seperator
+	 * Thousands separator
 	 */
 	private $thousands = '.'; // German
 
 	/**
-	 * Decimal seperator
+	 * Decimal separator
 	 */
 	private $decimals  = ','; // German
 
@@ -313,7 +313,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		// Set configuration instance if no registry ...
 		if (!$this instanceof Register) {
 			// ... because registries doesn't need to be configured
-			$this->setConfigInstance(FrameworkConfiguration::getInstance());
+			$this->setConfigInstance(FrameworkConfiguration::getSelfInstance());
 		} // END - if
 
 		// Is the startup time set? (0 cannot be true anymore)
@@ -364,10 +364,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 				// Add the type
 				$argsString .= $this->replaceControlCharacters($arg) . ' (' . gettype($arg);
 
-				// Add length if type is string
 				if (is_string($arg)) {
+					// Add length for strings
 					$argsString .= ', '.strlen($arg);
-				} // END - if
+				} elseif (is_array($arg)) {
+					// .. or size if array
+					$argsString .= ', '.count($arg);
+				} elseif ($arg === true) {
+					// ... is boolean 'true'
+					$argsString .= ', true';
+				} elseif ($arg === false) {
+					// ... is boolean 'true'
+					$argsString .= ', false';
+				}
 
 				// Closing bracket
 				$argsString .= '), ';
@@ -748,21 +757,21 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 	/**
 	 * Formats computer generated price values into human-understandable formats
-	 * with thousand and decimal seperators.
+	 * with thousand and decimal separators.
 	 *
 	 * @param	$value		The in computer format value for a price
 	 * @param	$currency	The currency symbol (use HTML-valid characters!)
 	 * @param	$decNum		Number of decimals after commata
 	 * @return	$price		The for the current language formated price string
-	 * @throws	MissingDecimalsThousandsSeperatorException	If decimals or
-	 *												thousands seperator
+	 * @throws	MissingDecimalsThousandsSeparatorException	If decimals or
+	 *												thousands separator
 	 *												is missing
 	 */
 	public function formatCurrency ($value, $currency = '€', $decNum = 2) {
 		// Are all required attriutes set?
 		if ((!isset($this->decimals)) || (!isset($this->thousands))) {
 			// Throw an exception
-			throw new MissingDecimalsThousandsSeperatorException($this, self::EXCEPTION_ATTRIBUTES_ARE_MISSING);
+			throw new MissingDecimalsThousandsSeparatorException($this, self::EXCEPTION_ATTRIBUTES_ARE_MISSING);
 		} // END - if
 
 		// Cast the number
@@ -893,7 +902,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		ApplicationEntryPoint::app_die(sprintf("<div class=\"debug_header\">%s debug output:</div><div class=\"debug_content\">%s</div>\nLoaded includes: <div class=\"debug_include_list\">%s</div>",
 			$this->__toString(),
 			$content,
-			ClassLoader::getInstance()->getPrintableIncludeList()
+			ClassLoader::getSelfInstance()->getPrintableIncludeList()
 		));
 	}
 
@@ -1403,8 +1412,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			// New PHP 5.1.0 function found, ignore errors
 			$hasSlept = @time_sleep_until($sleepUntil);
 		} else {
-			// My Sun Station doesn't have that function even with latest PHP
-			// package. :(
+			/*
+			 * My Sun station doesn't have that function even with latest PHP
+			 * package. :(
+			 */
 			usleep($milliSeconds * 1000);
 		}
 
@@ -1662,10 +1673,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Setter for handler instance
 	 *
-	 * @param	$handlerInstance	A Networkable instance
+	 * @param	$handlerInstance	An instance of a Handleable class
 	 * @return	void
 	 */
-	protected final function setHandlerInstance (Networkable $handlerInstance) {
+	protected final function setHandlerInstance (Handleable $handlerInstance) {
 		$this->handlerInstance = $handlerInstance;
 	}
 
@@ -1963,6 +1974,20 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		// And return it
 		return $executionTime;
 	}
+
+	/**
+	 * Hashes a given string with a simple but stronger hash function (no salts)
+	 *
+	 * @param	$str	The string to be hashed
+	 * @return	$hash	The hash from string $str
+	 */
+	public function hashString ($str) {
+		// Hash given string with (better secure) hasher
+		$hash = mhash(MHASH_SHA256, $str);
+
+		// Return it
+		return $hash;
+	}
 }
 
 // [EOF]