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 9de1559d65888d6c47f1d1cddcde1cde2e0c88be..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);
        }
 
        /**
@@ -148,9 +118,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startAnnouncement () {
+       protected function startAnnouncement () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'announcement');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'node_announcement');
        }
 
        /**
@@ -158,9 +128,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startAnnouncementData () {
+       protected function startAnnouncementData () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'announcement-data');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'announcement-data');
        }
 
        /**
@@ -168,9 +138,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startNodeStatus () {
+       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);
        }
 
        /**
@@ -178,9 +148,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startNodeMode () {
+       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);
        }
 
        /**
@@ -188,9 +158,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startListener () {
+       protected function startListener () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'listener');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'listener');
        }
 
        /**
@@ -198,9 +168,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startTcpPort () {
+       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);
        }
 
        /**
@@ -208,9 +178,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startUdpPort () {
+       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);
        }
 
        /**
@@ -218,9 +188,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startSessionId () {
+       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);
        }
 
        /**
@@ -228,9 +198,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startExternalIp () {
+       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);
        }
 
        /**
@@ -238,9 +208,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startInternalIp () {
+       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);
        }
 
        /**
@@ -248,9 +218,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startObjectTypeList () {
+       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');
        }
 
        /**
@@ -258,9 +228,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function startObjectType () {
+       protected function startObjectType () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'object-type');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'object-type');
        }
 
        /**
@@ -268,9 +238,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishObjectType () {
+       protected function finishObjectType () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -278,9 +248,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishObjectTypeList () {
+       protected function finishObjectTypeList () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -288,9 +258,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishSessionId () {
+       protected function finishSessionId () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -298,9 +268,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishInternalIp () {
+       protected function finishInternalIp () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -308,9 +278,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishExternalIp () {
+       protected function finishExternalIp () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -318,9 +288,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishUdpPort () {
+       protected function finishUdpPort () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -328,9 +298,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishTcpPort () {
+       protected function finishTcpPort () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -338,9 +308,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishListener () {
+       protected function finishListener () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -348,9 +318,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishNodeMode () {
+       protected function finishNodeMode () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -358,9 +328,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishNodeStatus () {
+       protected function finishNodeStatus () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -368,9 +338,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishAnnouncementData () {
+       protected function finishAnnouncementData () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -378,9 +348,9 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         *
         * @return      void
         */
-       private function finishAnnouncement () {
+       protected function finishAnnouncement () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 }