From e81d0500eb7e4547d54308e3f76e7ae7abee73e1 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 2 Oct 2023 22:48:23 +0900 Subject: [PATCH] Register spamfilter, tag, widget module triggers in module.xml --- modules/spamfilter/conf/module.xml | 11 +++- modules/spamfilter/spamfilter.class.php | 74 +------------------------ modules/tag/conf/module.xml | 9 +++ modules/tag/tag.class.php | 74 +++++-------------------- modules/widget/conf/module.xml | 7 ++- modules/widget/widget.class.php | 26 +-------- 6 files changed, 43 insertions(+), 158 deletions(-) diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml index a7071cb3c..76ed5c668 100644 --- a/modules/spamfilter/conf/module.xml +++ b/modules/spamfilter/conf/module.xml @@ -6,7 +6,7 @@ - + @@ -16,6 +16,15 @@ + + + + + + + + + Spam Filter diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php index 90cb60b6d..cc96c1957 100644 --- a/modules/spamfilter/spamfilter.class.php +++ b/modules/spamfilter/spamfilter.class.php @@ -7,51 +7,12 @@ */ class spamfilter extends ModuleObject { - protected static $_insert_triggers = array( - array('document.insertDocument', 'before', 'controller', 'triggerInsertDocument'), - array('document.updateDocument', 'before', 'controller', 'triggerInsertDocument'), - array('document.manage', 'before', 'controller', 'triggerManageDocument'), - array('comment.insertComment', 'before', 'controller', 'triggerInsertComment'), - array('comment.updateComment', 'before', 'controller', 'triggerInsertComment'), - array('communication.sendMessage', 'before', 'controller', 'triggerSendMessage'), - array('moduleObject.proc', 'before', 'controller', 'triggerCheckCaptcha'), - ); - - protected static $_delete_triggers = array( - array('trackback.insertTrackback', 'before', 'controller', 'triggerInsertTrackback'), - ); - - /** - * Register all triggers. - * - * @return object - */ - public function registerTriggers() - { - $oModuleController = getController('module'); - foreach (self::$_insert_triggers as $trigger) - { - if (!ModuleModel::getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) - { - $oModuleController->insertTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1]); - } - } - foreach (self::$_delete_triggers as $trigger) - { - if (ModuleModel::getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) - { - $oModuleController->deleteTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1]); - } - } - return new BaseObject(0, 'success_updated'); - } - /** * @brief Additional tasks required to accomplish during the installation */ public function moduleInstall() { - return $this->registerTriggers(); + } /** @@ -59,21 +20,6 @@ class spamfilter extends ModuleObject */ public function checkUpdate() { - foreach (self::$_insert_triggers as $trigger) - { - if (!ModuleModel::getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) - { - return true; - } - } - foreach (self::$_delete_triggers as $trigger) - { - if (ModuleModel::getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) - { - return true; - } - } - $oDB = DB::getInstance(); if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true; if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true; @@ -100,12 +46,6 @@ class spamfilter extends ModuleObject */ public function moduleUpdate() { - $output = $this->registerTriggers(); - if (!$output->toBool()) - { - return $output; - } - $oDB = DB::getInstance(); if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) { @@ -168,7 +108,7 @@ class spamfilter extends ModuleObject $config->captcha->type = 'none'; } - $output = getController('module')->insertModuleConfig($this->module, $config); + $output = ModuleController::getInstance()->insertModuleConfig($this->module, $config); if (!$output->toBool()) { return $output; @@ -176,14 +116,6 @@ class spamfilter extends ModuleObject } } - /** - * @brief Re-generate the cache file - */ - public function recompileCache() - { - - } - /** * Import configuration from reCAPTCHA addon. */ @@ -223,7 +155,7 @@ class spamfilter extends ModuleObject } $output->target_modules_type = ($config->xe_run_method === 'run_selected') ? '+' : '-'; - $oAddonAdminController = getAdminController('addon'); + $oAddonAdminController = AddonAdminController::getInstance(); if ($output->target_devices['pc']) { $oAddonAdminController->doDeactivate('recaptcha', 0, 'pc'); diff --git a/modules/tag/conf/module.xml b/modules/tag/conf/module.xml index d01bffb60..588556821 100644 --- a/modules/tag/conf/module.xml +++ b/modules/tag/conf/module.xml @@ -5,6 +5,15 @@ + + + + + + + + + 태그 diff --git a/modules/tag/tag.class.php b/modules/tag/tag.class.php index ab3d8b76a..a84b94990 100644 --- a/modules/tag/tag.class.php +++ b/modules/tag/tag.class.php @@ -10,86 +10,38 @@ class tag extends ModuleObject /** * @brief Implement if additional tasks are necessary when installing */ - function moduleInstall() + public function moduleInstall() { - $oModuleController = getController('module'); - $oDB = &DB::getInstance(); - - $oDB->addIndex("tags","idx_tag", array("document_srl","tag")); - // 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for - $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'); - $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'); - $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'); - $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'); - $oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'); - // 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag - $oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'); + $oDB = DB::getInstance(); + $oDB->addIndex('tags', 'idx_tag', array('document_srl', 'tag')); } /** * @brief a method to check if successfully installed */ - function checkUpdate() + public function checkUpdate() { - $oModuleModel = getModel('module'); - $oDB = &DB::getInstance(); - // 2007. 10. 17 trigger registration, if registered upset - if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true; - if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true; - if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true; - if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true; - if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true; - // 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag - if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true; // tag in the index column of the table tag - if(!$oDB->isIndexExists("tags","idx_tag")) return true; - if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'tag', 'controller', 'triggerMoveDocument', 'after')) return true; - + $oDB = DB::getInstance(); + if (!$oDB->isIndexExists('tags', 'idx_tag')) + { + return true; + } return false; } /** * @brief Execute update */ - function moduleUpdate() + public function moduleUpdate() { - $oModuleModel = getModel('module'); - $oModuleController = getController('module'); - $oDB = &DB::getInstance(); - // 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for - if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) - $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'); - - if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) - $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'); - - if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) - $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'); - - if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) - $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'); - - if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) - $oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'); - // 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag - if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) - $oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'); // tag in the index column of the table tag - if(!$oDB->isIndexExists("tags","idx_tag")) - $oDB->addIndex("tags","idx_tag", array("document_srl","tag")); - - if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'tag', 'controller', 'triggerMoveDocument', 'after')) + $oDB = DB::getInstance(); + if (!$oDB->isIndexExists('tags', 'idx_tag')) { - $oModuleController->insertTrigger('document.moveDocumentModule', 'tag', 'controller', 'triggerMoveDocument', 'after'); + $oDB->addIndex('tags', 'idx_tag', array('document_srl', 'tag')); } } - - /** - * @brief Re-generate the cache file - */ - function recompileCache() - { - } } /* End of file tag.class.php */ /* Location: ./modules/tag/tag.class.php */ diff --git a/modules/widget/conf/module.xml b/modules/widget/conf/module.xml index 08a43a33f..95a7e000f 100644 --- a/modules/widget/conf/module.xml +++ b/modules/widget/conf/module.xml @@ -6,7 +6,7 @@ - + @@ -14,11 +14,14 @@ - + + + + Widgets diff --git a/modules/widget/widget.class.php b/modules/widget/widget.class.php index 07389296e..4fd69b21b 100644 --- a/modules/widget/widget.class.php +++ b/modules/widget/widget.class.php @@ -10,47 +10,27 @@ class widget extends ModuleObject /** * @brief Implement if additional tasks are necessary when installing */ - function moduleInstall() + public function moduleInstall() { // Create cache directory used by widget FileHandler::makeDir('./files/cache/widget'); FileHandler::makeDir('./files/cache/widget_cache'); - // Add this widget compile the trigger for the display.after - $oModuleController = getController('module'); - $oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'); } /** * @brief a method to check if successfully installed */ - function checkUpdate() + public function checkUpdate() { - $oModuleModel = getModel('module'); - // widget compile display.after trigger for further (04/14/2009) - if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true; - return false; } /** * @brief Execute update */ - function moduleUpdate() + public function moduleUpdate() { - $oModuleModel = getModel('module'); - $oModuleController = getController('module'); - // widget compile display.after trigger for further (04/14/2009) - if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) - { - $oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'); - } - } - /** - * @brief Re-generate the cache file - */ - function recompileCache() - { } } /* End of file widget.class.php */