X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Ftemplate%2Fanswer%2Fannouncement%2Fclass_XmlAnnouncementAnswerTemplateEngine.php;h=d4f0dc738feb5291a01b3d09437e84388d45e16f;hb=ea369fbf3b5ab38fa5616561502015855e024b53;hp=953d681308a3e785b6afa31715df344d3a4c1b20;hpb=39dfb6a3efe19d1fc7393c78629a9a5b5acd083d;p=hub.git diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php index 953d68130..d4f0dc738 100644 --- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php @@ -2,11 +2,11 @@ /** * An AnnouncementAnswer template engine class for XML templates * - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core 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 @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implements CompileableTemplate, Registerable { +class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine implements CompileableTemplate, Registerable { /** * Some XML nodes must be available for later data extraction */ @@ -30,8 +30,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen 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'; + const ANNOUNCEMENT_DATA_LISTEN_PORT = 'my-listen-port'; /** * Protected constructor @@ -50,14 +49,15 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen // Data from *this* node self::ANNOUNCEMENT_DATA_EXTERNAL_IP, self::ANNOUNCEMENT_DATA_INTERNAL_IP, - self::ANNOUNCEMENT_DATA_TCP_PORT, - self::ANNOUNCEMENT_DATA_UDP_PORT, + self::ANNOUNCEMENT_DATA_LISTEN_PORT, self::ANNOUNCEMENT_DATA_NODE_STATUS, self::ANNOUNCEMENT_DATA_SESSION_ID, // Data from other node 'your-external-ip', 'your-internal-ip', 'your-session-id', + // Answer status (generic field) + self::ANSWER_STATUS, ); } @@ -98,14 +98,14 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen // 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('node_announcement_answer'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_announcement_answer'), $characters); } /** @@ -124,7 +124,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startAnnouncementAnswer () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'announcement-answer'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'announcement-answer'); } /** @@ -134,7 +134,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startMyData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'my-data'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'my-data'); } /** @@ -144,7 +144,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startMyExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); } /** @@ -154,7 +154,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startMyInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_INTERNAL_IP); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_INTERNAL_IP); } /** @@ -162,19 +162,9 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - protected function startMyTcpPort () { + protected function startMyListenPort () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_TCP_PORT); - } - - /** - * Starts the my-udp-port - * - * @return void - */ - protected function startMyUdpPort () { - // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_UDP_PORT); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_LISTEN_PORT); } /** @@ -184,7 +174,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startMySessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_SESSION_ID); } /** @@ -194,7 +184,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startMyStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_NODE_STATUS); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_NODE_STATUS); } /** @@ -204,7 +194,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishMyStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -214,17 +204,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishMySessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); - } - - /** - * Finishes the my-udp-port - * - * @return void - */ - protected function finishMyUdpPort () { - // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -232,9 +212,9 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - protected function finishMyTcpPort () { + protected function finishMyListenPort () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -244,7 +224,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishMyInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -254,7 +234,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishMyExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -264,7 +244,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishMyData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -274,7 +254,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startYourData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-data'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-data'); } /** @@ -284,7 +264,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startYourExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-external-ip'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-external-ip'); } /** @@ -294,7 +274,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startYourInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-internal-ip'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-internal-ip'); } /** @@ -304,7 +284,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function startYourSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-session-id'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-session-id'); } /** @@ -314,7 +294,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishYourSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -324,7 +304,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishYourInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -334,7 +314,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishYourExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -344,7 +324,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishYourData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -354,7 +334,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen */ protected function finishAnnouncementAnswer () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } }