Introduced experimental apt-proxy sub project (a connector for apt-proxy usage into...

[hub.git] / application / hub / main / template / announcement / class_XmlAnnouncementTemplateEngine.php

diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
index 11e7e759d5e79bf87eae93c2afec224453e23b25..e0fdbd70a990244bd43728fabf35f4836c09ee6c 100644 (file)
--- a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
+++ b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
@@ -80,21 +80,6 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
                return $templateInstance;
        }
 
-       /**
-        * Load a specified announcement template into the engine
-        *
-        * @param       $template       The announcement template we shall load which is
-        *                                              located in 'announcement' by default
-        * @return      void
-        */
-       public function loadAnnouncementTemplate ($template = 'self_announcement') {
-               // Set template type
-               $this->setTemplateType($this->getConfigInstance()->getConfigEntry('node_announcement_template_type'));
-
-               // Load the special template
-               $this->loadTemplate($template);
-       }
-
        /**
         * Currently not used
         *
@@ -116,22 +101,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
                 * Assign the found characters to variable and use the last entry from
                 * stack as the name.
                 */
-               parent::assignVariable($this->getStackerInstance()->getNamed('announcement'), $characters);
-       }
-
-       /**
-        * Read announcement variables by calling readVariable() with 'general' as
-        * variable stack.
-        *
-        * @param       $key    Key to read from
-        * @return      $value  Value from variable
-        */
-       public function readAnnouncementData ($key) {
-               // Read the variable
-               $value = parent::readVariable($key, 'general');
-
-               // Return value
-               return $value;
+               parent::assignVariable($this->getStackerInstance()->getNamed('node_announcement'), $characters);
        }
 
        /**
@@ -150,7 +120,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startAnnouncement () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'announcement');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'node_announcement');
        }
 
        /**
@@ -160,7 +130,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startAnnouncementData () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'announcement-data');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'announcement-data');
        }
 
        /**
@@ -170,7 +140,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startNodeStatus () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS);
        }
 
        /**
@@ -180,7 +150,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startNodeMode () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_NODE_MODE);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_MODE);
        }
 
        /**
@@ -190,7 +160,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startListener () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'listener');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'listener');
        }
 
        /**
@@ -200,7 +170,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startTcpPort () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_TCP_PORT);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_TCP_PORT);
        }
 
        /**
@@ -210,7 +180,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startUdpPort () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_UDP_PORT);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_UDP_PORT);
        }
 
        /**
@@ -220,7 +190,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startSessionId () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_SESSION_ID);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_SESSION_ID);
        }
 
        /**
@@ -230,7 +200,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startExternalIp () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP);
        }
 
        /**
@@ -240,7 +210,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startInternalIp () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP);
        }
 
        /**
@@ -250,7 +220,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startObjectTypeList () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'object-type-list');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'object-type-list');
        }
 
        /**
@@ -260,7 +230,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startObjectType () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'object-type');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'object-type');
        }
 
        /**
@@ -270,7 +240,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishObjectType () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -280,7 +250,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishObjectTypeList () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -290,7 +260,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishSessionId () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -300,7 +270,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishInternalIp () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -310,7 +280,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishExternalIp () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -320,7 +290,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishUdpPort () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -330,7 +300,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishTcpPort () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -340,7 +310,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishListener () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -350,7 +320,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishNodeMode () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -360,7 +330,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishNodeStatus () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -370,7 +340,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishAnnouncementData () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -380,7 +350,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishAnnouncement () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 }