From fe591dbe1cb9e0c9fc1e846de3f1a0f934af1a2a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 26 Jun 2012 15:35:22 +0000
Subject: [PATCH] Re-renamed :(
---
.../class_PackageAnnouncementAnswerTagFilter.php | 2 +-
.../class_XmlAnnouncementAnswerTemplateEngine.php | 14 +++++++-------
.../answer/announcement/announcement_answer.xml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
index 394f6a1f4..bb078205b 100644
--- a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
+++ b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
@@ -40,7 +40,7 @@ class PackageAnnouncementAnswerTagFilter extends BaseFilter implements Filterabl
$this->dataXmlNodes = array(
XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP => '',
XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_IP => '',
- XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATE => '',
+ 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/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
index 0ba2e814a..a1e28a948 100644
--- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
@@ -27,7 +27,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements
* Some XML nodes must be available for later data extraction
*/
const ANNOUNCEMENT_DATA_SESSION_ID = 'my-session-id';
- const ANNOUNCEMENT_DATA_NODE_STATE = 'my-state';
+ 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';
@@ -53,7 +53,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements
'my-tcp-port',
'my-udp-port',
'my-session-id',
- 'my-state',
+ 'my-status',
// Data from other node
'your-external-ip',
'your-internal-ip',
@@ -368,21 +368,21 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements
}
/**
- * Starts the my-state
+ * Starts the my-status
*
* @return void
*/
- private function startMyState () {
+ private function startMyStatus () {
// Push the node name on the stacker
- $this->getStackerInstance()->pushNamed('announcement_answer', 'my-state');
+ $this->getStackerInstance()->pushNamed('announcement_answer', 'my-status');
}
/**
- * Finishes the my-state
+ * Finishes the my-status
*
* @return void
*/
- private function finishMyState () {
+ private function finishMyStatus () {
// Pop the last entry
$this->getStackerInstance()->popNamed('announcement_answer');
}
diff --git a/application/hub/templates/xml/answer/announcement/announcement_answer.xml b/application/hub/templates/xml/answer/announcement/announcement_answer.xml
index a496d5141..48bcfde93 100644
--- a/application/hub/templates/xml/answer/announcement/announcement_answer.xml
+++ b/application/hub/templates/xml/answer/announcement/announcement_answer.xml
@@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
<!--
This node's status
//-->
- <my-state>{?my_state?}</my-state>
+ <my-status>{?node_status?}</my-status>
</my-data>
<!--
The following data is the other node's data. This data is being sent to
--
2.39.5