Don't use 'my-' as long as you don't need it

diff --git a/application/hub/main/filter/class_BaseHubFilter.php b/application/hub/main/filter/class_BaseHubFilter.php
index 2dabdc669877ed924d9e658b21edb312f96ffd7c..fd8d07fee1517e8c8f125a300c1f5314ce068d33 100644 (file)
--- a/application/hub/main/filter/class_BaseHubFilter.php
+++ b/application/hub/main/filter/class_BaseHubFilter.php
@@ -85,7 +85,7 @@ class BaseHubFilter extends BaseFilter {
                        } // END - if
 
                        // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(str_replace('_', '-', strtoupper($messageType)) . '-TAG: key=' . $key . ',value=' . $value);
+                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(str_replace('_', '-', strtoupper($messageType)) . '-TAG: key=' . $key . ',value=' . $value);
 
                        // Set it now
                        $this->dataXmlNodes[$key] = $value;

diff --git a/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php b/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
index 93942b8b85ced90121ba1fae510c0a3a3873ae03..180a131b64e7dacff8a7ecd5a669d99fe7da2390 100644 (file)
--- a/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
+++ b/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
@@ -47,12 +47,7 @@ class NodeMessageRequestNodeListAnswerHandler extends BaseMessageHandler impleme
                */
                );
 
-               // Init config-copy array
-               $this->configCopy = array(
-                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_SESSION_ID  => 'session_id',
-               );
-
-               // Init array
+               // Init search data array
                $this->searchData = array(
                        XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_SESSION_ID,
                );

diff --git a/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php b/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
index ff5f030e6dab5e1e0848cdd0454b557eac42189e..4db5c1f5da6d5a1274356768c101573f891c5eb4 100644 (file)
--- a/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
+++ b/application/hub/main/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
@@ -41,7 +41,6 @@ class NodeMessageRequestNodeListHandler extends BaseMessageHandler implements Ha
 
                // Init config-copy array
                $this->configCopy = array(
-                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_SESSION_ID  => 'session_id',
                );
 
                // Init search data array

diff --git a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
index 3dee4a96030fe594a9185262c3a3af78bb008aa4..ec365a4aa6ef633fc2e7a2a3979aa8dbbdd6589d 100644 (file)
--- a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
@@ -24,7 +24,7 @@
  */
 class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine implements CompileableTemplate, Registerable {
        // Constants for array elements
-       const REQUEST_DATA_SESSION_ID = 'my-session-id';
+       const REQUEST_DATA_SESSION_ID = 'session-id';
        const REQUEST_DATA_NODE_LIST  = 'node-list';
 
        /**
@@ -116,11 +116,11 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine imple
        }
 
        /**
-        * Starts the my-session-id
+        * Starts the session-id
         *
         * @return      void
         */
-       protected function startMySessionId () {
+       protected function startSessionId () {
                // Push the node name on the stacker
                $this->getStackerInstance()->pushNamed('node_request_node_list_answer', self::REQUEST_DATA_SESSION_ID);
        }
@@ -146,11 +146,11 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine imple
        }
 
        /**
-        * Finishes the my-session-id
+        * Finishes the session-id
         *
         * @return      void
         */
-       protected function finishMySessionId () {
+       protected function finishSessionId () {
                // Pop the last entry
                $this->getStackerInstance()->popNamed('node_request_node_list_answer');
        }

diff --git a/application/hub/templates/xml/answer/requests/request_node_list_answer.xml b/application/hub/templates/xml/answer/requests/request_node_list_answer.xml
index fbdeb9fbcaca893c743a2132ded92248fa5fda97..e61ca369a1b1c69a0947ef59039e4884d433196a 100644 (file)
--- a/application/hub/templates/xml/answer/requests/request_node_list_answer.xml
+++ b/application/hub/templates/xml/answer/requests/request_node_list_answer.xml
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <!--
        My session id
        //-->
-       <my-session-id>{?my_session_id?}</my-session-id>
+       <session-id>{?session_id?}</session-id>
        <!--
        List of all nodes (will be completed later)
        //-->