From a9c315c022840a31e051201a61078dcde368f389 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Aug 2012 13:47:56 +0000 Subject: [PATCH] Development/refacturing continued: - Added more generic (BaseFooFilter) classes for foo filter (node, chat, cruncher) - Made code in method 'processMessage()' generic and moved to 'BaseHubFilter:genericProcessMessage()' (no static call!!!) - Added package tag filter for 'request_node_list' tag --- .gitattributes | 5 + application/hub/config.php | 3 + .../activation/node/class_NodeActivation | 2 +- ...s_NodeActivationSelfAnnouncementFilter.php | 2 +- .../filter/bootstrap/chat/class_ChatBootstrap | 2 +- ..._ChatBootstrapExtraBootstrappingFilter.php | 2 +- ...s_ChatBootstrapGenericActivationFilter.php | 2 +- .../cruncher/class_CruncherBootstrap | 2 +- ...rBootstrapBufferQueueInitializerFilter.php | 2 +- ...ncherBootstrapExtraBootstrappingFilter.php | 2 +- ...uncherBootstrapGenericActivationFilter.php | 2 +- .../filter/bootstrap/node/class_NodeBootstrap | 2 +- ..._NodeBootstrapExtraBootstrappingFilter.php | 2 +- ...lass_NodeBootstrapGenerateNodeIdFilter.php | 2 +- ..._NodeBootstrapGeneratePrivateKeyFilter.php | 2 +- ...s_NodeBootstrapGenerateSessionIdFilter.php | 2 +- .../class_NodeBootstrapInitQueuesFilter.php | 2 +- .../class_NodeBootstrapListenerPoolFilter.php | 2 +- ...ass_NodeBootstrapRestoreNodeListFilter.php | 2 +- .../chat/class_ChatInitializationFilter.php | 2 +- .../chat/class_ChatPhpRequirementsFilter.php | 2 +- .../chat/class_ChatWelcomeTeaserFilter.php | 2 +- application/hub/main/filter/class_ | 2 +- .../hub/main/filter/class_BaseChatFilter.php | 38 ++++++ .../main/filter/class_BaseCruncherFilter.php | 38 ++++++ .../hub/main/filter/class_BaseHubFilter.php | 111 ++++++++++++++++++ .../hub/main/filter/class_BaseNodeFilter.php | 38 ++++++ .../hub/main/filter/cruncher/class_Cruncher | 2 +- .../class_CruncherInitializationFilter.php | 2 +- .../class_CruncherPhpRequirementsFilter.php | 2 +- .../class_CruncherWelcomeTeaserFilter.php | 2 +- application/hub/main/filter/node/class_Node | 2 +- .../node/class_NodeInitializationFilter.php | 2 +- .../node/class_NodePhpRequirementsFilter.php | 2 +- .../node/class_NodeWelcomeTeaserFilter.php | 2 +- .../chat/class_ChatShutdownFilter.php | 2 +- .../cruncher/class_CruncherShutdownFilter.php | 2 +- .../filter/shutdown/node/class_NodeShutdown | 2 +- .../class_NodeShutdownDeinitQueuesFilter.php | 2 +- .../class_NodeShutdownFlushNodeListFilter.php | 2 +- .../node/class_NodeShutdownNodeFilter.php | 2 +- .../class_NodeShutdownTaskHandlerFilter.php | 2 +- ...ass_PackageAnnouncementAnswerTagFilter.php | 7 +- .../class_PackageAnnouncementTagFilter.php | 57 +-------- .../class_PackageRequestNodeListTagFilter.php | 75 ++++++++++++ .../class_PackageSelfConnectTagFilter.php | 57 +-------- ...class_ChatTaskHandlerInitializerFilter.php | 2 +- ...s_CruncherTaskHandlerInitializerFilter.php | 2 +- ...class_NodeTaskHandlerInitializerFilter.php | 2 +- 49 files changed, 356 insertions(+), 151 deletions(-) create mode 100644 application/hub/main/filter/class_BaseChatFilter.php create mode 100644 application/hub/main/filter/class_BaseCruncherFilter.php create mode 100644 application/hub/main/filter/class_BaseHubFilter.php create mode 100644 application/hub/main/filter/class_BaseNodeFilter.php create mode 100644 application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php diff --git a/.gitattributes b/.gitattributes index fbcdc8f46..2f44213fe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -273,6 +273,10 @@ application/hub/main/filter/chat/class_ChatInitializationFilter.php svneol=nativ application/hub/main/filter/chat/class_ChatPhpRequirementsFilter.php svneol=native#text/plain application/hub/main/filter/chat/class_ChatWelcomeTeaserFilter.php svneol=native#text/plain application/hub/main/filter/class_ svneol=native#text/plain +application/hub/main/filter/class_BaseChatFilter.php svneol=native#text/plain +application/hub/main/filter/class_BaseCruncherFilter.php svneol=native#text/plain +application/hub/main/filter/class_BaseHubFilter.php svneol=native#text/plain +application/hub/main/filter/class_BaseNodeFilter.php svneol=native#text/plain application/hub/main/filter/console/.htaccess -text svneol=unset#text/plain application/hub/main/filter/cruncher/.htaccess svneol=native#text/plain application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php svneol=native#text/plain @@ -296,6 +300,7 @@ application/hub/main/filter/tags/.htaccess -text svneol=unset#text/plain application/hub/main/filter/tags/answer/.htaccess -text svneol=unset#text/plain application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php svneol=native#text/plain application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php svneol=native#text/plain +application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php svneol=native#text/plain application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php svneol=native#text/plain application/hub/main/filter/task/.htaccess -text svneol=unset#text/plain application/hub/main/filter/task/chat/.htaccess svneol=native#text/plain diff --git a/application/hub/config.php b/application/hub/config.php index 169e8ff82..992dbe9cf 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -210,6 +210,9 @@ $cfg->setConfigEntry('package_tag_announcement_answer_filter', 'PackageAnnouncem // CFG: PACKAGE-TAG-SELF-CONNECT-FILTER $cfg->setConfigEntry('package_tag_self_connect_filter', 'PackageSelfConnectTagFilter'); +// CFG: PACKAGE-TAG-REQUEST-NODE-LIST-FILTER +$cfg->setConfigEntry('package_tag_request_node_list_filter', 'PackageRequestNodeListTagFilter'); + // CFG: MESSAGE-TYPE-ANNOUNCEMENT-HANDLER-CLASS $cfg->setConfigEntry('message_type_announcement_handler_class', 'NodeMessageAnnouncementHandler'); diff --git a/application/hub/main/filter/activation/node/class_NodeActivation b/application/hub/main/filter/activation/node/class_NodeActivation index 891447016..3cf893fd6 100644 --- a/application/hub/main/filter/activation/node/class_NodeActivation +++ b/application/hub/main/filter/activation/node/class_NodeActivation @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class HubActivation???Filter extends BaseFilter implements Filterable { +class HubActivation???Filter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php b/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php index 85751e786..2e2a6d39f 100644 --- a/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php +++ b/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeActivationSelfAnnouncementFilter extends BaseFilter implements Filterable { +class NodeActivationSelfAnnouncementFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/chat/class_ChatBootstrap b/application/hub/main/filter/bootstrap/chat/class_ChatBootstrap index b8fabd8e8..810fecfdc 100644 --- a/application/hub/main/filter/bootstrap/chat/class_ChatBootstrap +++ b/application/hub/main/filter/bootstrap/chat/class_ChatBootstrap @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatBootstrap???Filter extends BaseFilter implements Filterable { +class ChatBootstrap???Filter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php b/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php index 45c372f0f..2c10143cf 100644 --- a/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php +++ b/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatBootstrapExtraBootstrappingFilter extends BaseFilter implements Filterable { +class ChatBootstrapExtraBootstrappingFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php b/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php index ced9a3450..ef584aa22 100644 --- a/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php +++ b/application/hub/main/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatBootstrapGenericActivationFilter extends BaseFilter implements Filterable { +class ChatBootstrapGenericActivationFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrap b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrap index 74225c9ce..9318434b9 100644 --- a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrap +++ b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrap @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherBootstrap???Filter extends BaseFilter implements Filterable { +class CruncherBootstrap???Filter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php index 667d9496c..18508d945 100644 --- a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php +++ b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherBootstrapBufferQueueInitializerFilter extends BaseFilter implements Filterable { +class CruncherBootstrapBufferQueueInitializerFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php index 6b010e7df..ec976f8d0 100644 --- a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php +++ b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherBootstrapExtraBootstrappingFilter extends BaseFilter implements Filterable { +class CruncherBootstrapExtraBootstrappingFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php index 2faff3226..f7a0f4994 100644 --- a/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php +++ b/application/hub/main/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherBootstrapGenericActivationFilter extends BaseFilter implements Filterable { +class CruncherBootstrapGenericActivationFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrap b/application/hub/main/filter/bootstrap/node/class_NodeBootstrap index 07faca5f6..5371b8ae7 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrap +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrap @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrap???Filter extends BaseFilter implements Filterable { +class NodeBootstrap???Filter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapExtraBootstrappingFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapExtraBootstrappingFilter.php index 53bd64e8c..7a8748668 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapExtraBootstrappingFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapExtraBootstrappingFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapExtraBootstrappingFilter extends BaseFilter implements Filterable { +class NodeBootstrapExtraBootstrappingFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateNodeIdFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateNodeIdFilter.php index 13cc689cb..e2784f9b9 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateNodeIdFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateNodeIdFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapGenerateNodeIdFilter extends BaseFilter implements Filterable { +class NodeBootstrapGenerateNodeIdFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGeneratePrivateKeyFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGeneratePrivateKeyFilter.php index ffa1d3f4b..6c70fb394 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGeneratePrivateKeyFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGeneratePrivateKeyFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapGeneratePrivateKeyFilter extends BaseFilter implements Filterable { +class NodeBootstrapGeneratePrivateKeyFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateSessionIdFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateSessionIdFilter.php index d047ff377..fd3079487 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateSessionIdFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapGenerateSessionIdFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapGenerateSessionIdFilter extends BaseFilter implements Filterable { +class NodeBootstrapGenerateSessionIdFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php index 2b2ef0dd2..63371d3e2 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapInitQueuesFilter extends BaseFilter implements Filterable { +class NodeBootstrapInitQueuesFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapListenerPoolFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapListenerPoolFilter.php index 98147fcb0..5a7bd4c84 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapListenerPoolFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapListenerPoolFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapListenerPoolFilter extends BaseFilter implements Filterable { +class NodeBootstrapListenerPoolFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php index e63327c7f..79ae01a6b 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeBootstrapRestoreNodeListFilter extends BaseFilter implements Filterable { +class NodeBootstrapRestoreNodeListFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/chat/class_ChatInitializationFilter.php b/application/hub/main/filter/chat/class_ChatInitializationFilter.php index eacf6deb1..98971e8d3 100644 --- a/application/hub/main/filter/chat/class_ChatInitializationFilter.php +++ b/application/hub/main/filter/chat/class_ChatInitializationFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatInitializationFilter extends BaseFilter implements Filterable { +class ChatInitializationFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/chat/class_ChatPhpRequirementsFilter.php b/application/hub/main/filter/chat/class_ChatPhpRequirementsFilter.php index 3b5e2b3a7..fafda5ea3 100644 --- a/application/hub/main/filter/chat/class_ChatPhpRequirementsFilter.php +++ b/application/hub/main/filter/chat/class_ChatPhpRequirementsFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatPhpRequirementsFilter extends BaseFilter implements Filterable { +class ChatPhpRequirementsFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/chat/class_ChatWelcomeTeaserFilter.php b/application/hub/main/filter/chat/class_ChatWelcomeTeaserFilter.php index e6d57276f..8a69ee688 100644 --- a/application/hub/main/filter/chat/class_ChatWelcomeTeaserFilter.php +++ b/application/hub/main/filter/chat/class_ChatWelcomeTeaserFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatWelcomeTeaserFilter extends BaseFilter implements Filterable { +class ChatWelcomeTeaserFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/class_ b/application/hub/main/filter/class_ index 758b734da..9b9c40be5 100644 --- a/application/hub/main/filter/class_ +++ b/application/hub/main/filter/class_ @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class Hub!!!???Filter extends BaseFilter implements Filterable { +class Hub!!!???Filter extends BaseHubFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/class_BaseChatFilter.php b/application/hub/main/filter/class_BaseChatFilter.php new file mode 100644 index 000000000..ab63d9ece --- /dev/null +++ b/application/hub/main/filter/class_BaseChatFilter.php @@ -0,0 +1,38 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseChatFilter extends BaseHubFilter { + /** + * Protected constructor + * + * @param $className Real name of class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } +} + +// [EOF] +?> diff --git a/application/hub/main/filter/class_BaseCruncherFilter.php b/application/hub/main/filter/class_BaseCruncherFilter.php new file mode 100644 index 000000000..395968bad --- /dev/null +++ b/application/hub/main/filter/class_BaseCruncherFilter.php @@ -0,0 +1,38 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseCruncherFilter extends BaseHubFilter { + /** + * Protected constructor + * + * @param $className Real name of class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } +} + +// [EOF] +?> diff --git a/application/hub/main/filter/class_BaseHubFilter.php b/application/hub/main/filter/class_BaseHubFilter.php new file mode 100644 index 000000000..82189fa4e --- /dev/null +++ b/application/hub/main/filter/class_BaseHubFilter.php @@ -0,0 +1,111 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseHubFilter extends BaseFilter { + /** + * Array with all data XML nodes (which hold the actual data) and their values + */ + protected $dataXmlNodes = array(); + + /** + * Protected constructor + * + * @param $className Real name of class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } + + /** + * Processes the given raw message content. The method renderXmlContent + * may throw (not the method itself) several exceptions: + * + * InvalidXmlNodeException - If an invalid XML node has been found (e.g. + * wrong/out-dated template used) + * XmlNodeMismatchException - Again might be caused by invalid XML node + * usage + * XmlParserException - If the XML message is damaged or not + * well-formed + * + * @param $messageType Type of message + * @param $messageContent Raw message content + * @param $packageInstance An instance of a Receivable class + * @return void + * @todo Exceptions from renderXmlContent() are currently unhandled + */ + protected function genericProcessMessage ($messageType, $messageContent, Receivable $packageInstance) { + // Get a template instance from the factory + $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('node_' . $messageType . '_template_class'); + + // And render the XML content (aka message) + $templateInstance->renderXmlContent($messageContent); + + /* + * The template system now stores all required data as 'general' + * variables, so simply get them. If there is an invalid XML node + * inside the message, the above method call will cause exceptions. + */ + foreach ($this->dataXmlNodes as $key => $dummy) { + // Generate method name + $methodName = 'read' . $this->convertToClassName($messageType) . 'Data'; + + // Call it + $value = call_user_func(array($templateInstance, $methodName), $key); + + /* + * If value is NULL, a variable hasn't been found. This could mean + * that *this* node is running an out-dated software or the other + * peer is using an out-dated $messageType.xml template. + */ + if (is_null($value)) { + // Output a warning + self::createDebugInstance(__CLASS__)->debugOutput(str_replace('_', '-', strtoupper($messageType)) . '-TAG: Found not fully supported variable ' . $key . ' - skipping.'); + + // Skip this part, don't write NULLs to the array + continue; + } // END - if + + // Debug message + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(str_replace('_', '-', strtoupper($messageType)) . '-TAG: key=' . $key . ',value=' . $value); + + // Set it now + $this->dataXmlNodes[$key] = $value; + } // END - foreach + + // Construct an array for pushing it on next stack + $messageArray = array( + // Message data itself + NetworkPackage::MESSAGE_ARRAY_DATA => $this->dataXmlNodes, + // Message type (which is $messageType) + NetworkPackage::MESSAGE_ARRAY_TYPE => $messageType + ); + + // Push the processed message back on stack + $packageInstance->getStackerInstance()->pushNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE, $messageArray); +} + +// [EOF] +?> + } diff --git a/application/hub/main/filter/class_BaseNodeFilter.php b/application/hub/main/filter/class_BaseNodeFilter.php new file mode 100644 index 000000000..c3f4ae85b --- /dev/null +++ b/application/hub/main/filter/class_BaseNodeFilter.php @@ -0,0 +1,38 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class BaseNodeFilter extends BaseHubFilter { + /** + * Protected constructor + * + * @param $className Real name of class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } +} + +// [EOF] +?> diff --git a/application/hub/main/filter/cruncher/class_Cruncher b/application/hub/main/filter/cruncher/class_Cruncher index f44e3661a..32ca1f586 100644 --- a/application/hub/main/filter/cruncher/class_Cruncher +++ b/application/hub/main/filter/cruncher/class_Cruncher @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class Cruncher???Filter extends BaseFilter implements Filterable { +class Cruncher???Filter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php b/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php index 0f3920e6d..97b9067ad 100644 --- a/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php +++ b/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherInitializationFilter extends BaseFilter implements Filterable { +class CruncherInitializationFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/cruncher/class_CruncherPhpRequirementsFilter.php b/application/hub/main/filter/cruncher/class_CruncherPhpRequirementsFilter.php index fdc2719a0..82beb0784 100644 --- a/application/hub/main/filter/cruncher/class_CruncherPhpRequirementsFilter.php +++ b/application/hub/main/filter/cruncher/class_CruncherPhpRequirementsFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherPhpRequirementsFilter extends BaseFilter implements Filterable { +class CruncherPhpRequirementsFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/cruncher/class_CruncherWelcomeTeaserFilter.php b/application/hub/main/filter/cruncher/class_CruncherWelcomeTeaserFilter.php index 23b497b25..f066850e0 100644 --- a/application/hub/main/filter/cruncher/class_CruncherWelcomeTeaserFilter.php +++ b/application/hub/main/filter/cruncher/class_CruncherWelcomeTeaserFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherWelcomeTeaserFilter extends BaseFilter implements Filterable { +class CruncherWelcomeTeaserFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/node/class_Node b/application/hub/main/filter/node/class_Node index 6bc274ead..eca905df1 100644 --- a/application/hub/main/filter/node/class_Node +++ b/application/hub/main/filter/node/class_Node @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class Node???Filter extends BaseFilter implements Filterable { +class Node???Filter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/node/class_NodeInitializationFilter.php b/application/hub/main/filter/node/class_NodeInitializationFilter.php index 6eaec8309..7f2002f89 100644 --- a/application/hub/main/filter/node/class_NodeInitializationFilter.php +++ b/application/hub/main/filter/node/class_NodeInitializationFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeInitializationFilter extends BaseFilter implements Filterable { +class NodeInitializationFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php b/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php index 84c27cd33..f905e2355 100644 --- a/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php +++ b/application/hub/main/filter/node/class_NodePhpRequirementsFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodePhpRequirementsFilter extends BaseFilter implements Filterable { +class NodePhpRequirementsFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/node/class_NodeWelcomeTeaserFilter.php b/application/hub/main/filter/node/class_NodeWelcomeTeaserFilter.php index c17b302f8..aa3e8ec72 100644 --- a/application/hub/main/filter/node/class_NodeWelcomeTeaserFilter.php +++ b/application/hub/main/filter/node/class_NodeWelcomeTeaserFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeWelcomeTeaserFilter extends BaseFilter implements Filterable { +class NodeWelcomeTeaserFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/chat/class_ChatShutdownFilter.php b/application/hub/main/filter/shutdown/chat/class_ChatShutdownFilter.php index 1af852d46..cc2f859aa 100644 --- a/application/hub/main/filter/shutdown/chat/class_ChatShutdownFilter.php +++ b/application/hub/main/filter/shutdown/chat/class_ChatShutdownFilter.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatShutdownFilter extends BaseFilter implements Filterable { +class ChatShutdownFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/cruncher/class_CruncherShutdownFilter.php b/application/hub/main/filter/shutdown/cruncher/class_CruncherShutdownFilter.php index 1a83c6608..b8bb0bc4b 100644 --- a/application/hub/main/filter/shutdown/cruncher/class_CruncherShutdownFilter.php +++ b/application/hub/main/filter/shutdown/cruncher/class_CruncherShutdownFilter.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherShutdownFilter extends BaseFilter implements Filterable { +class CruncherShutdownFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/node/class_NodeShutdown b/application/hub/main/filter/shutdown/node/class_NodeShutdown index 3f2078de8..f5b0d3183 100644 --- a/application/hub/main/filter/shutdown/node/class_NodeShutdown +++ b/application/hub/main/filter/shutdown/node/class_NodeShutdown @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class HubShutdown???Filter extends BaseFilter implements Filterable { +class HubShutdown???Filter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php b/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php index bc3ff9044..facfedaa9 100644 --- a/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php +++ b/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeShutdownDeinitQueuesFilter extends BaseFilter implements Filterable { +class NodeShutdownDeinitQueuesFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/node/class_NodeShutdownFlushNodeListFilter.php b/application/hub/main/filter/shutdown/node/class_NodeShutdownFlushNodeListFilter.php index 9908b4295..99fa5249f 100644 --- a/application/hub/main/filter/shutdown/node/class_NodeShutdownFlushNodeListFilter.php +++ b/application/hub/main/filter/shutdown/node/class_NodeShutdownFlushNodeListFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeShutdownFlushNodeListFilter extends BaseFilter implements Filterable { +class NodeShutdownFlushNodeListFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/node/class_NodeShutdownNodeFilter.php b/application/hub/main/filter/shutdown/node/class_NodeShutdownNodeFilter.php index 4bc1f8d02..c4af0c280 100644 --- a/application/hub/main/filter/shutdown/node/class_NodeShutdownNodeFilter.php +++ b/application/hub/main/filter/shutdown/node/class_NodeShutdownNodeFilter.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeShutdownNodeFilter extends BaseFilter implements Filterable { +class NodeShutdownNodeFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php b/application/hub/main/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php index d3764630b..43b16b2ad 100644 --- a/application/hub/main/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php +++ b/application/hub/main/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeShutdownTaskHandlerFilter extends BaseFilter implements Filterable { +class NodeShutdownTaskHandlerFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php index 1f537d0cb..4a50e0608 100644 --- a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php +++ b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php @@ -21,12 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class PackageAnnouncementAnswerTagFilter extends BaseFilter implements FilterablePackage { - /** - * Array with all data XML nodes (which hold the actual data) and their values - */ - private $dataXmlNodes = array(); - +class PackageAnnouncementAnswerTagFilter extends BaseNodeFilter implements FilterablePackage { /** * Protected constructor * diff --git a/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php b/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php index 9b241e7f6..c17b23939 100644 --- a/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php +++ b/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,12 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class PackageAnnouncementTagFilter extends BaseFilter implements FilterablePackage { - /** - * Array with all data XML nodes (which hold the actual data) and their values - */ - private $dataXmlNodes = array(); - +class PackageAnnouncementTagFilter extends BaseNodeFilter implements FilterablePackage { /** * Protected constructor * @@ -87,54 +82,10 @@ class PackageAnnouncementTagFilter extends BaseFilter implements FilterablePacka * @param $messageContent Raw message content * @param $packageInstance An instance of a Receivable class * @return void - * @todo Exceptions from renderXmlContent() are currently unhandled */ public function processMessage ($messageContent, Receivable $packageInstance) { - // Get a template instance from the factory - $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('node_announcement_template_class'); - - // And render the XML content (aka message) - $templateInstance->renderXmlContent($messageContent); - - /* - * The template system now stores all required data as 'general' - * variables, so simply get them. If there is an invalid XML node - * inside the message, the above method call will cause exceptions. - */ - foreach ($this->dataXmlNodes as $key => $dummy) { - // Get the variable from template engine - $value = $templateInstance->readAnnouncementData($key); - - /* - * If value is NULL, a variable hasn't been found. This could mean - * that *this* node is running an out-dated software or the other - * peer is using an out-dated announcement.xml template. - */ - if (is_null($value)) { - // Output a warning - self::createDebugInstance(__CLASS__)->debugOutput('ANNOUNCEMENT-TAG: Found not fully supported variable ' . $key . ' - skipping.'); - - // Skip this part, don't write NULLs to the array - continue; - } // END - if - - // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('ANNOUNCEMENT-TAG: key=' . $key . ',value=' . $value); - - // Set it now - $this->dataXmlNodes[$key] = $value; - } // END - foreach - - // Construct an array for pushing it on next stack - $messageArray = array( - // Message data itself - NetworkPackage::MESSAGE_ARRAY_DATA => $this->dataXmlNodes, - // Message type (which is 'announcement') - NetworkPackage::MESSAGE_ARRAY_TYPE => 'announcement' - ); - - // Push the processed message back on stack - $packageInstance->getStackerInstance()->pushNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE, $messageArray); + // Process message generic + $this->genericProcessMessage('announcement', $messageContent, $packageInstance); } } diff --git a/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php b/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php new file mode 100644 index 000000000..f97e76b52 --- /dev/null +++ b/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php @@ -0,0 +1,75 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class PackageRequestNodeListTagFilter extends BaseNodeFilter implements FilterablePackage { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this filter class + * + * @return $filterInstance An instance of this filter class + */ + public final static function createPackageRequestNodeListTagFilter () { + // Get a new instance + $filterInstance = new PackageRequestNodeListTagFilter(); + + // Return the instance + return $filterInstance; + } + + /** + * Executes the filter with given request and response objects + * + * @param $requestInstance An instance of a class with an Requestable interface + * @param $responseInstance An instance of a class with an Responseable interface + * @return void + * @throws UnsupportedOperationException If this method is called + */ + public function execute (Requestable $requestInstance, Responseable $responseInstance) { + // Please don't call this method + throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); + } + + /** + * Processes the given raw message content. + * + * @param $messageContent Raw message content + * @param $packageInstance An instance of a Receivable class + * @return void + */ + public function processMessage ($messageContent, Receivable $packageInstance) { + // Process messasge generic + $this->genericProcessMessage('request_node_list', $messageContent, $packageInstance); + } +} + +// [EOF] +?> diff --git a/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php b/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php index 81cfddf61..d8fac4045 100644 --- a/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php +++ b/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,12 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class PackageSelfConnectTagFilter extends BaseFilter implements FilterablePackage { - /** - * Array with all data XML nodes (which hold the actual data) and their values - */ - private $dataXmlNodes = array(); - +class PackageSelfConnectTagFilter extends BaseNodeFilter implements FilterablePackage { /** * Protected constructor * @@ -83,54 +78,10 @@ class PackageSelfConnectTagFilter extends BaseFilter implements FilterablePackag * @param $messageContent Raw message content * @param $packageInstance An instance of a Receivable class * @return void - * @todo Exceptions from renderXmlContent() are currently unhandled */ public function processMessage ($messageContent, Receivable $packageInstance) { - // Get a template instance from the factory - $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('node_self_connect_template_class'); - - // And render the XML content (aka message) - $templateInstance->renderXmlContent($messageContent); - - /* - * The template system now stores all required data as 'general' - * variables, so simply get them. If there is an invalid XML node - * inside the message, the above method call will cause exceptions. - */ - foreach ($this->dataXmlNodes as $key => $dummy) { - // Get the variable from template engine - $value = $templateInstance->readSelfConnectData($key); - - /* - * If value is NULL, a variable hasn't been found. This could mean - * that *this* node is running an out-dated software or the other - * peer is using an out-dated self_connect.xml template. - */ - if (is_null($value)) { - // Output a warning - self::createDebugInstance(__CLASS__)->debugOutput('SELF-CONNECT-TAG: Found not fully supported variable ' . $key . ' - skipping.'); - - // Skip this part, don't write NULLs to the array - continue; - } // END - if - - // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SELF-CONNECT-TAG: key=' . $key . ',value=' . $value); - - // Set it now - $this->dataXmlNodes[$key] = $value; - } // END - foreach - - // Construct an array for pushing it on next stack - $messageArray = array( - // Message data itself - NetworkPackage::MESSAGE_ARRAY_DATA => $this->dataXmlNodes, - // Message type (which is 'self_connect') - NetworkPackage::MESSAGE_ARRAY_TYPE => 'self_connect' - ); - - // Push the processed message back on stack - $packageInstance->getStackerInstance()->pushNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE, $messageArray); + // Process generic + $this->genericProcessMessage('self_connect', $messageContent, $packageInstance); } } diff --git a/application/hub/main/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php b/application/hub/main/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php index 215eb2eda..db6646c3c 100644 --- a/application/hub/main/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php +++ b/application/hub/main/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ChatTaskHandlerInitializerFilter extends BaseFilter implements Filterable { +class ChatTaskHandlerInitializerFilter extends BaseChatFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php b/application/hub/main/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php index d98a2b8ab..b4ef8b4e0 100644 --- a/application/hub/main/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php +++ b/application/hub/main/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CruncherTaskHandlerInitializerFilter extends BaseFilter implements Filterable { +class CruncherTaskHandlerInitializerFilter extends BaseCruncherFilter implements Filterable { /** * Protected constructor * diff --git a/application/hub/main/filter/task/node/class_NodeTaskHandlerInitializerFilter.php b/application/hub/main/filter/task/node/class_NodeTaskHandlerInitializerFilter.php index 6d58048d9..e9f9f4d54 100644 --- a/application/hub/main/filter/task/node/class_NodeTaskHandlerInitializerFilter.php +++ b/application/hub/main/filter/task/node/class_NodeTaskHandlerInitializerFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class NodeTaskHandlerInitializerFilter extends BaseFilter implements Filterable { +class NodeTaskHandlerInitializerFilter extends BaseNodeFilter implements Filterable { /** * Protected constructor * -- 2.39.5