XML nodes renamed to match naming convention

[core.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 08f63abc3ff49c2b2701642603cc5fddc53fce0b..afb1cfaa12ddbd79b09bcffb384a2eb92c9a6a38 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -88,6 +88,16 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         */
        private $listInstance = null;
 
+       /**
+        * Instance of a menu
+        */
+       private $menuInstance = null;
+
+       /**
+        * Instance of the image
+        */
+       private $imageInstance = null;
+
        /**
         * The real class name
         */
@@ -674,7 +684,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;
@@ -922,11 +932,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                // Generate it from config and localize depencies
                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 +1215,44 @@ 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;
+       }
 }
 
 // [EOF]