X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=923ef2805d6f7ca1419cc20da32246e18d663241;hp=c085e8e4d4d9667d736f453ad14ed793f8224746;hb=43deb129f6e8a12c37f0df17ad0870d3491bdd34;hpb=2aa1e932d56ada938159b6955a27eed0b59bd9cd

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index c085e8e4..923ef280 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -88,6 +88,31 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $listInstance = null;
 
+	/**
+	 * Instance of a menu
+	 */
+	private $menuInstance = null;
+
+	/**
+	 * Instance of the image
+	 */
+	private $imageInstance = null;
+
+	/**
+	 * Instance of the stacker
+	 */
+	private $stackerInstance = null;
+
+	/**
+	 * A Compressor instance
+	 */
+	private $compressorInstance = null;
+
+	/**
+	 * A Parseable instance
+	 */
+	private $parserInstance = null;
+
 	/**
 	 * The real class name
 	 */
@@ -221,7 +246,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			// Some arguments are there
 			foreach ($args as $arg) {
 				// Add the type
-				$argsString .= $arg . ' (' . gettype($arg);
+				$argsString .= $this->replaceControlCharacters($arg) . ' (' . gettype($arg);
 
 				// Add length if type is string
 				if (gettype($arg) == 'string') $argsString .= ', '.strlen($arg);
@@ -674,7 +699,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		}
 
 		// Initialize the template engine
-		$templateInstance = ObjectFactory::createObjectByConfiguredName('template_class', array($appInstance));
+		$templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class', array($appInstance));
 
 		// Return the prepared instance
 		return $templateInstance;
@@ -716,6 +741,25 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		));
 	}
 
+	/**
+	 * Replaces control characters with printable output
+	 *
+	 * @param	$str	String with control characters
+	 * @return	$str	Replaced string
+	 */
+	protected function replaceControlCharacters ($str) {
+		// Replace them
+		$str = str_replace(
+			"\r", '[r]', str_replace(
+			"\n", '[n]', str_replace(
+			"\t", '[t]',
+			$str
+		)));
+
+		// Return it
+		return $str;
+	}
+
 	/**
 	 * Output a partial stub message for the caller method
 	 *
@@ -885,7 +929,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$readable = $this->getLanguageInstance()->getMessage('null_timestamp');
 		} else {
 			switch ($this->getLanguageInstance()->getLanguageCode()) {
-				case "de": // German format is a bit different to default
+				case 'de': // German format is a bit different to default
 					// Split the GMT stamp up
 					$dateTime  = explode(' ', $timestamp  );
 					$dateArray = explode('-', $dateTime[0]);
@@ -905,13 +949,35 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 				default: // Default is pass-through
 					$readable = $timestamp;
 					break;
-			}
+			} // END - switch
 		}
 
 		// Return the stamp
 		return $readable;
 	}
 
+	/**
+	 * Filter a given number into a localized number
+	 *
+	 * @param	$value		The raw value from e.g. database
+	 * @return	$localized	Localized value
+	 */
+	public function doFilterFormatNumber ($value) {
+		// Generate it from config and localize dependencies
+		switch ($this->getLanguageInstance()->getLanguageCode()) {
+			case 'de': // German format is a bit different to default
+				$localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), ',', '.');
+				break;
+
+			default: // US, etc.
+				$localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), '.', ',');
+				break;
+		} // END - switch
+
+		// Return it
+		return $localized;
+	}
+
 	/**
 	 * "Getter" for databse entry
 	 *
@@ -1183,6 +1249,101 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	protected final function getListInstance () {
 		return $this->listInstance;
 	}
+
+	/**
+	 * Setter for the menu instance
+	 *
+	 * @param	$menuInstance	A RenderableMenu instance
+	 * @return	void
+	 */
+	protected final function setMenuInstance (RenderableMenu $menuInstance) {
+		$this->menuInstance = $menuInstance;
+	}
+
+	/**
+	 * Getter for the menu instance
+	 *
+	 * @return	$menuInstance	A RenderableMenu instance
+	 */
+	protected final function getMenuInstance () {
+		return $this->menuInstance;
+	}
+
+	/**
+	 * Setter for image instanxe
+	 *
+	 * @param	$imageInstance	An instance of an image
+	 * @return	void
+	 */
+	public final function setImageInstance (BaseImage $imageInstance) {
+		$this->imageInstance = $imageInstance;
+	}
+
+	/**
+	 * Getter for image instanxe
+	 *
+	 * @return	$imageInstance	An instance of an image
+	 */
+	public final function getImageInstance () {
+		return $this->imageInstance;
+	}
+
+	/**
+	 * Setter for stacker instanxe
+	 *
+	 * @param	$stackerInstance	An instance of an stacker
+	 * @return	void
+	 */
+	public final function setStackerInstance (Stackable $stackerInstance) {
+		$this->stackerInstance = $stackerInstance;
+	}
+
+	/**
+	 * Getter for stacker instanxe
+	 *
+	 * @return	$stackerInstance	An instance of an stacker
+	 */
+	public final function getStackerInstance () {
+		return $this->stackerInstance;
+	}
+
+	/**
+	 * Setter for compressor instanxe
+	 *
+	 * @param	$compressorInstance	An instance of an compressor
+	 * @return	void
+	 */
+	public final function setCompressorInstance (Compressor $compressorInstance) {
+		$this->compressorInstance = $compressorInstance;
+	}
+
+	/**
+	 * Getter for compressor instanxe
+	 *
+	 * @return	$compressorInstance	An instance of an compressor
+	 */
+	public final function getCompressorInstance () {
+		return $this->compressorInstance;
+	}
+
+	/**
+	 * Setter for Parseable instanxe
+	 *
+	 * @param	$parserInstance	An instance of an Parseable
+	 * @return	void
+	 */
+	public final function setParserInstance (Parseable $parserInstance) {
+		$this->parserInstance = $parserInstance;
+	}
+
+	/**
+	 * Getter for Parseable instanxe
+	 *
+	 * @return	$parserInstance	An instance of an Parseable
+	 */
+	public final function getParserInstance () {
+		return $this->parserInstance;
+	}
 }
 
 // [EOF]