From 48e4746f7dfb07494f1f92ca04d1670620818a91 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 22 Jul 2016 16:11:25 +0900 Subject: [PATCH] Automatically exclude deleted groups from point/level/group integration --- modules/point/point.class.php | 4 ++++ modules/point/point.controller.php | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index ef40999d4..305e6a094 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -85,6 +85,7 @@ class point extends ModuleObject $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before'); $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after'); $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'); + $oModuleController->insertTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after'); $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after'); $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after'); // Add a trigger for voting up and down 2008.05.13 haneul @@ -121,6 +122,7 @@ class point extends ModuleObject if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true; if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true; if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true; + if(!$oModuleModel->getTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after')) return true; if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true; if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true; // Add a trigger for voting up and down 2008.05.13 haneul @@ -169,6 +171,8 @@ class point extends ModuleObject $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after'); if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'); + if(!$oModuleModel->getTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after')) + $oModuleController->insertTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after'); if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after'); if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 5253957cd..0fcd42236 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -60,6 +60,25 @@ class pointController extends point return new Object(); } + /** + * @brief Member group deletion trigger + */ + function triggerDeleteGroup(&$obj) + { + // Get the point module config + $config = getModel('module')->getModuleConfig('point'); + // Get the group_srl of the deleted group + $group_srl = $obj->group_srl; + // Exclude deleted group from point/level/group integration + if($config->point_group && isset($config->point_group[$group_srl])) + { + unset($config->point_group[$group_srl]); + getController('module')->insertModuleConfig('point', $config); + } + + return new Object(); + } + /** * @brief A trigger to add points to the member for creating a post */