Updated 'core'.

[hub.git] / application / hub / main / template / connect / class_XmlSelfConnectTemplateEngine.php

diff --git a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
index 3c0a786fbddbb6425e462500f1c101d8b85017f9..543fc7251a8beb6d20e58d849671ab849c11d9fb 100644 (file)
--- a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
+++ b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
@@ -2,11 +2,11 @@
 /**
  * An SelfConnect template engine class for XML templates
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  * @todo               This template engine does not make use of setTemplateType()
  *
  * This program is free software: you can redistribute it and/or modify
@@ -39,11 +39,11 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
                parent::__construct(__CLASS__);
 
                // Init array
-               $this->subNodes = array(
+               $this->setSubNodes(array(
                        'self-connect-data',
                        self::SELF_CONNECT_DATA_NODE_ID,
                        self::SELF_CONNECT_DATA_SESSION_ID
-               );
+               ));
        }
 
        /**
@@ -68,21 +68,6 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
                return $templateInstance;
        }
 
-       /**
-        * Load a specified self-connect template into the engine
-        *
-        * @param       $template       The self-connect template we shall load which is
-        *                                              located in 'self_connect' by default
-        * @return      void
-        */
-       public function loadSelfConnectTemplate ($template = 'self_connect') {
-               // Set template type
-               $this->setTemplateType($this->getConfigInstance()->getConfigEntry('node_self_connect_template_type'));
-
-               // Load the special template
-               $this->loadTemplate($template);
-       }
-
        /**
         * Currently not used
         *
@@ -98,29 +83,14 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
                // Is this string empty?
                if (empty($characters)) {
                        // Then skip it silently
-                       return false;
+                       return;
                } // END - if
 
                /*
                 * Assign the found characters to variable and use the last entry from
                 * stack as the name
                 */
-               parent::assignVariable($this->getStackerInstance()->getNamed('self_connect'), $characters);
-       }
-
-       /**
-        * Read self-connect variables by calling readVariable() with 'general' as
-        * variable stack.
-        *
-        * @param       $key    Key to read from
-        * @return      $value  Value from variable
-        */
-       public function readSelfConnectData ($key) {
-               // Read the variable
-               $value = parent::readVariable($key, 'general');
-
-               // Return value
-               return $value;
+               parent::assignVariable($this->getStackInstance()->getNamed('node_self_connect'), $characters);
        }
 
        /**
@@ -139,7 +109,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function startSelfConnect () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('self_connect', 'self-connect');
+               $this->getStackInstance()->pushNamed('node_self_connect', 'self-connect');
        }
 
        /**
@@ -149,7 +119,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function startSelfConnectData () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('self_connect', 'self-connect-data');
+               $this->getStackInstance()->pushNamed('node_self_connect', 'self-connect-data');
        }
 
        /**
@@ -159,7 +129,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function startNodeId () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('self_connect', self::SELF_CONNECT_DATA_NODE_ID);
+               $this->getStackInstance()->pushNamed('node_self_connect', self::SELF_CONNECT_DATA_NODE_ID);
        }
 
        /**
@@ -169,7 +139,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function startSessionId () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('self_connect', self::SELF_CONNECT_DATA_SESSION_ID);
+               $this->getStackInstance()->pushNamed('node_self_connect', self::SELF_CONNECT_DATA_SESSION_ID);
        }
 
        /**
@@ -179,7 +149,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function finishSessionId () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('self_connect');
+               $this->getStackInstance()->popNamed('node_self_connect');
        }
 
        /**
@@ -189,7 +159,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function finishNodeId () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('self_connect');
+               $this->getStackInstance()->popNamed('node_self_connect');
        }
 
        /**
@@ -199,7 +169,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function finishSelfConnectData () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('self_connect');
+               $this->getStackInstance()->popNamed('node_self_connect');
        }
 
        /**
@@ -209,7 +179,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
         */
        protected function finishSelfConnect () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('self_connect');
+               $this->getStackInstance()->popNamed('node_self_connect');
        }
 }