From 2ec5e34a177a926b25d70c46d965b6fcd0e5178d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 26 May 2012 22:45:27 +0000
Subject: [PATCH] Use 'my_' prefix for 'my' (local) node's data

---
 .../class_PackageAnnouncementAnswerTagFilter.php     | 12 ++++++------
 .../class_NodeAnnouncementMessageAnswerHelper.php    |  2 +-
 .../class_XmlAnnouncementAnswerTemplateEngine.php    | 10 ++++++++++
 .../xml/answer/announcement/announcement_answer.xml  | 12 ++++++------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
index f0d6bf520..12e12a0cd 100644
--- a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
+++ b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
@@ -38,12 +38,12 @@ class PackageAnnouncementAnswerTagFilter extends BaseFilter implements Filterabl
 
 		// Init array
 		$this->dataXmlNodes = array(
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_IP => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATUS => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID  => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_TCP_PORT    => 9060,
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_UDP_PORT    => 9060
+			XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP => '',
+			XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_IP => '',
+			XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATUS => '',
+			XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID  => '',
+			XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_TCP_PORT    => 9060,
+			XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_UDP_PORT    => 9060
 		);
 	}
 
diff --git a/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php b/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php
index a02daae18..80a72381e 100644
--- a/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php
+++ b/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php
@@ -47,7 +47,7 @@ class NodeAnnouncementMessageAnswerHelper extends BaseHubAnswerHelper implements
 		$helperInstance = new NodeAnnouncementMessageAnswerHelper();
 
 		// Set session id of other peer as recipient
-		$helperInstance->setRecipientType($messageData[XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID]);
+		$helperInstance->setRecipientType($messageData[XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID]);
 
 		// Set message data
 		$helperInstance->setMessageData($messageData);
diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
index 3ec35f132..a1e28a948 100644
--- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
@@ -23,6 +23,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements CompileableTemplate, Registerable {
+	/**
+	 * Some XML nodes must be available for later data extraction
+	 */
+	const ANNOUNCEMENT_DATA_SESSION_ID  = 'my-session-id';
+	const ANNOUNCEMENT_DATA_NODE_STATUS = 'my-status';
+	const ANNOUNCEMENT_DATA_EXTERNAL_IP = 'my-external-ip';
+	const ANNOUNCEMENT_DATA_INTERNAL_IP = 'my-internal-ip';
+	const ANNOUNCEMENT_DATA_TCP_PORT    = 'my-tcp-port';
+	const ANNOUNCEMENT_DATA_UDP_PORT    = 'my-udp-port';
+
 	/**
 	 * Main nodes in the XML tree
 	 */
diff --git a/application/hub/templates/xml/answer/announcement/announcement_answer.xml b/application/hub/templates/xml/answer/announcement/announcement_answer.xml
index 7694b4449..647ad9825 100644
--- a/application/hub/templates/xml/answer/announcement/announcement_answer.xml
+++ b/application/hub/templates/xml/answer/announcement/announcement_answer.xml
@@ -30,27 +30,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<!--
 		This node's external IP/hostname
 		//-->
-		<my-external-ip>{?external_ip?}</my-external-ip>
+		<my-external-ip>{?my_external_ip?}</my-external-ip>
 		<!--
 		This node's internal IP/hostname
 		//-->
-		<my-internal-ip>{?internal_ip?}</my-internal-ip>
+		<my-internal-ip>{?my_internal_ip?}</my-internal-ip>
 		<!--
 		This node's TCP port
 		//-->
-		<my-tcp-port>{?node_tcp_listen_port?}</my-tcp-port>
+		<my-tcp-port>{?my_tcp_port?}</my-tcp-port>
 		<!--
 		This node's UDP port
 		//-->
-		<my-udp-port>{?node_udp_listen_port?}</my-udp-port>
+		<my-udp-port>{?my_udp_port?}</my-udp-port>
 		<!--
 		This node's session id
 		//-->
-		<my-session-id>{?session_id?}</my-session-id>
+		<my-session-id>{?my_session_id?}</my-session-id>
 		<!--
 		This node's status
 		//-->
-		<my-status>{?node_status?}</my-status>
+		<my-status>{?my_status?}</my-status>
 	</my-data>
 	<!--
 	The following data is the other node's data. This data is being sent to
-- 
2.39.5