From 488704acf01f1000efef5e2b2dfd76fae1265f2a Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 16 Mar 2016 14:48:54 +0900
Subject: [PATCH] Move trigger to moduleObject.proc.after for better
 consistency

---
 modules/communication/communication.class.php | 19 ++++++++++++++++++-
 .../communication.controller.php              |  5 +++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php
index a4b2518d3..fd8600e27 100644
--- a/modules/communication/communication.class.php
+++ b/modules/communication/communication.class.php
@@ -9,9 +9,12 @@
 class communication extends ModuleObject
 {
 	private $triggers = array(
-		array('moduleHandler.init', 'communication', 'controller', 'triggerModuleHandlerBefore', 'before'),
+		array('moduleObject.proc', 'communication', 'controller', 'triggerModuleProcAfter', 'after'),
 		array('member.getMemberMenu', 'communication', 'controller', 'triggerMemberMenu', 'before')
 	);
+	private $delete_triggers = array(
+		array('moduleHandler.init', 'communication', 'controller', 'triggerModuleHandlerBefore', 'before'),
+	);
 	
 	/**
 	 * Implement if additional tasks are necessary when installing
@@ -47,6 +50,13 @@ class communication extends ModuleObject
 				return TRUE;
 			}
 		}
+		foreach($this->delete_triggers as $trigger)
+		{
+			if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
+			{
+				return TRUE;
+			}
+		}
 		
 		if(!is_dir("./files/member_extra_info/new_message_flags"))
 		{
@@ -72,6 +82,13 @@ class communication extends ModuleObject
 				$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]))
+			{
+				$oModuleController->deleteTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);
+			}
+		}
 		
 		if(!is_dir("./files/member_extra_info/new_message_flags"))
 		{
diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 56c161bc4..9b04e270d 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -798,6 +798,11 @@ class communicationController extends communication
 	}
 
 	function triggerModuleHandlerBefore($obj)
+	{
+		return $this->triggerModuleProcAfter($obj);
+	}
+	
+	function triggerModuleProcAfter($obj)
 	{
 		if(!Context::get('is_logged') || $obj->module == 'member')
 		{