From 0ad91c06e610764c5eef3c851e3c1a065ac52ace Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 31 Aug 2023 13:48:02 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=84=BC=ED=84=B0?= =?UTF-8?q?=EC=9D=98=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=ED=98=B8=EC=B6=9C?= =?UTF-8?q?=EB=93=A4=EC=9D=84=20module.xml=20=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=98=B8=EC=B6=9C=EB=A1=9C=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/conf/module.xml | 20 +++++++++++ modules/ncenterlite/ncenterlite.class.php | 42 ----------------------- 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/modules/ncenterlite/conf/module.xml b/modules/ncenterlite/conf/module.xml index 2833951a5..6ba00e5fe 100644 --- a/modules/ncenterlite/conf/module.xml +++ b/modules/ncenterlite/conf/module.xml @@ -30,6 +30,26 @@ + + + + + + + + + + + + + + + + + + + + 알림센터 Lite diff --git a/modules/ncenterlite/ncenterlite.class.php b/modules/ncenterlite/ncenterlite.class.php index 8cf7ab2b2..fc3cd1b97 100644 --- a/modules/ncenterlite/ncenterlite.class.php +++ b/modules/ncenterlite/ncenterlite.class.php @@ -15,35 +15,12 @@ class ncenterlite extends ModuleObject var $_TYPE_CUSTOM = 'U'; //Updated alert(uses type table) var $_TYPE_INSERT_MEMBER = 'I'; // Insert Member - var $triggers = array( - array('comment.insertComment', 'ncenterlite', 'controller', 'triggerAfterInsertComment', 'after'), - array('comment.deleteComment', 'ncenterlite', 'controller', 'triggerAfterDeleteComment', 'after'), - array('document.insertDocument', 'ncenterlite', 'controller', 'triggerAfterInsertDocument', 'after'), - array('document.deleteDocument', 'ncenterlite', 'controller', 'triggerAfterDeleteDocument', 'after'), - array('display', 'ncenterlite', 'controller', 'triggerBeforeDisplay', 'before'), - array('moduleHandler.proc', 'ncenterlite', 'controller', 'triggerAfterModuleHandlerProc', 'after'), - array('member.deleteMember', 'ncenterlite', 'controller', 'triggerAfterDeleteMember', 'after'), - array('communication.sendMessage', 'ncenterlite', 'controller', 'triggerAfterSendMessage', 'after'), - array('document.updateVotedCount', 'ncenterlite', 'controller', 'triggerAfterDocumentVotedUpdate', 'after'), - array('document.updateVotedCountCancel', 'ncenterlite', 'controller', 'triggerAfterDocumentVotedCancel', 'after'), - array('member.procMemberScrapDocument', 'ncenterlite', 'controller', 'triggerAfterScrap', 'after'), - array('moduleHandler.init', 'ncenterlite', 'controller', 'triggerAddMemberMenu', 'after'), - array('document.moveDocumentToTrash', 'ncenterlite', 'controller', 'triggerAfterMoveToTrash', 'after'), - array('comment.moveCommentToTrash', 'ncenterlite', 'controller', 'triggerAfterMoveToTrashComment', 'after'), - array('comment.updateVotedCount', 'ncenterlite', 'controller', 'triggerAfterCommentVotedCount', 'after'), - array('comment.updateVotedCountCancel', 'ncenterlite', 'controller', 'triggerAfterCommentVotedCancel', 'after'), - // 2020. 05. 30 add menu when popup document menu called - array('document.getDocumentMenu', 'ncenterlite', 'controller', 'triggerGetDocumentMenu', 'after'), - array('comment.getCommentMenu', 'ncenterlite', 'controller', 'triggerGetCommentMenu', 'after'), - ); - private $delete_triggers = array( array('moduleObject.proc', 'ncenterlite', 'controller', 'triggerBeforeModuleObjectProc', 'before') ); function moduleInstall() { - } function checkUpdate() @@ -51,11 +28,6 @@ class ncenterlite extends ModuleObject $oModuleModel = getModel('module'); $oDB = &DB::getInstance(); - foreach($this->triggers as $trigger) - { - if(!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) return true; - } - foreach($this->delete_triggers as $trigger) { if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) @@ -147,14 +119,6 @@ class ncenterlite extends ModuleObject $oModuleController = getController('module'); $oDB = &DB::getInstance(); - foreach($this->triggers as $trigger) - { - if(!$oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) - { - $oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]); - } - } - foreach($this->delete_triggers as $trigger) { if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) @@ -282,12 +246,6 @@ class ncenterlite extends ModuleObject function moduleUninstall() { - $oModuleController = getController('module'); - - foreach($this->triggers as $trigger) - { - $oModuleController->deleteTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]); - } return new BaseObject(); } From 13601a73b6e2276221bb0a45c588a4bed16091b6 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Fri, 1 Sep 2023 12:45:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=ED=95=98=EB=8A=94=20=EC=95=A1=EC=85=98=EC=9D=84=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.class.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.class.php b/modules/ncenterlite/ncenterlite.class.php index fc3cd1b97..163120cd2 100644 --- a/modules/ncenterlite/ncenterlite.class.php +++ b/modules/ncenterlite/ncenterlite.class.php @@ -15,10 +15,6 @@ class ncenterlite extends ModuleObject var $_TYPE_CUSTOM = 'U'; //Updated alert(uses type table) var $_TYPE_INSERT_MEMBER = 'I'; // Insert Member - private $delete_triggers = array( - array('moduleObject.proc', 'ncenterlite', 'controller', 'triggerBeforeModuleObjectProc', 'before') - ); - function moduleInstall() { } @@ -28,14 +24,6 @@ class ncenterlite extends ModuleObject $oModuleModel = getModel('module'); $oDB = &DB::getInstance(); - foreach($this->delete_triggers as $trigger) - { - if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) - { - return true; - } - } - foreach(['notify_type', 'readed', 'target_body', 'target_browser', 'target_p_srl'] as $column_name) { if(!$oDB->isColumnExists('ncenterlite_notify', $column_name)) @@ -119,14 +107,6 @@ class ncenterlite extends ModuleObject $oModuleController = getController('module'); $oDB = &DB::getInstance(); - foreach($this->delete_triggers as $trigger) - { - if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4])) - { - $oModuleController->deleteTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]); - } - } - if(!$oDB->isColumnExists('ncenterlite_notify','notify_type')) { $oDB->addColumn('ncenterlite_notify', 'notify_type', 'number', 11, 0); From 7ddecec80287573bcd1a9d0d0699ba5df90221d2 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Fri, 1 Sep 2023 12:46:29 +0900 Subject: [PATCH 3/3] =?UTF-8?q?PHP=20=EC=B0=B8=EC=A1=B0=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.class.php b/modules/ncenterlite/ncenterlite.class.php index 163120cd2..d0b91bf17 100644 --- a/modules/ncenterlite/ncenterlite.class.php +++ b/modules/ncenterlite/ncenterlite.class.php @@ -22,7 +22,7 @@ class ncenterlite extends ModuleObject function checkUpdate() { $oModuleModel = getModel('module'); - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); foreach(['notify_type', 'readed', 'target_body', 'target_browser', 'target_p_srl'] as $column_name) { @@ -105,7 +105,7 @@ class ncenterlite extends ModuleObject { $oModuleModel = getModel('module'); $oModuleController = getController('module'); - $oDB = &DB::getInstance(); + $oDB = DB::getInstance(); if(!$oDB->isColumnExists('ncenterlite_notify','notify_type')) {