X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=ecca05012742e2f3eff381b42a470bfd0854bea6;hb=11cbacb35e308a58c919b672b368780bd8f11661;hp=08f63abc3ff49c2b2701642603cc5fddc53fce0b;hpb=4cc300204f65c423121fd9b08e13d152764dfa86;p=core.git

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 08f63abc..ecca0501 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -88,6 +88,21 @@ 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;
+
 	/**
 	 * The real class name
 	 */
@@ -221,7 +236,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 +689,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 +731,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
 	 *
@@ -919,14 +953,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 * @return	$localized	Localized value
 	 */
 	public function doFilterFormatNumber ($value) {
-		// Generate it from config and localize depencies
+		// 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()->readConfig('decimals'), ',', '.');
+				$localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), ',', '.');
 				break;
 
 			default: // US, etc.
-				$localized = number_format($value, $this->getConfigInstance()->readConfig('decimals'), '.', ',');
+				$localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), '.', ',');
 				break;
 		} // END - switch
 
@@ -1205,6 +1239,63 @@ 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;
+	}
 }
 
 // [EOF]