From 11418f67e82ab51b0623749de5f24d34fbe1cd8a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 30 Jan 2013 21:06:46 +0000
Subject: [PATCH] Don't use 'my-' as long as you don't need it

---
 application/hub/main/filter/class_BaseHubFilter.php    |  2 +-
 .../class_NodeMessageRequestNodeListAnswerHandler.php  |  7 +------
 .../class_NodeMessageRequestNodeListHandler.php        |  1 -
 .../class_XmlRequestNodeListAnswerTemplateEngine.php   | 10 +++++-----
 .../xml/answer/requests/request_node_list_answer.xml   |  2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/application/hub/main/filter/class_BaseHubFilter.php b/application/hub/main/filter/class_BaseHubFilter.php
index 2dabdc669..fd8d07fee 100644
--- 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 93942b8b8..180a131b6 100644
--- 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 ff5f030e6..4db5c1f5d 100644
--- 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 3dee4a960..ec365a4aa 100644
--- 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 fbdeb9fbc..e61ca369a 100644
--- 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)
 	//-->
-- 
2.39.5