From 9fc1926dc361af29c422dcb0be87f93732315f64 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 16 Mar 2016 19:19:53 +0900
Subject: [PATCH] Fix disappearing message & friend menu in other places, too

---
 modules/communication/communication.class.php | 18 +--------
 .../communication.controller.php              | 37 +++++++------------
 2 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php
index fd8600e27..35f51b2a8 100644
--- a/modules/communication/communication.class.php
+++ b/modules/communication/communication.class.php
@@ -9,12 +9,10 @@
 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
@@ -50,13 +48,6 @@ 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"))
 		{
@@ -82,13 +73,6 @@ 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 a287e8657..3845e8b20 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -799,29 +799,10 @@ class communicationController extends communication
 
 	function triggerModuleHandlerBefore($obj)
 	{
-		return $this->triggerModuleProcAfter($obj);
-	}
-	
-	function triggerModuleProcAfter($obj)
-	{
-		if(!Context::get('is_logged') || $obj->module == 'member')
-		{
-			return new Object();
-		}
-		$logged_info = Context::get('logged_info');
-		$oCommunicationModel = getModel('communication');
-		$config = $oCommunicationModel->getConfig();
-		if($obj->module == 'admin')
-		{
-			return new Object();
-		}
-		if($config->enable_message == 'N' && $config->enable_friend == 'N')
-		{
-			return new Object();
-		}
-		
 		// Add menus on the member login information
+		$config = getModel('communication')->getConfig();
 		$oMemberController = getController('member');
+		
 		if($config->enable_message == 'Y')
 		{
 			$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
@@ -831,13 +812,23 @@ class communicationController extends communication
 		{
 			$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
 		}
+	}
+	
+	function triggerModuleProcAfter($obj)
+	{
+		if (!Context::get('is_logged') || $obj->module == 'member' || $obj->module == 'admin')
+		{
+			return new Object();
+		}
 		
-		if (starts_with('dispCommunication', Context::get('act')))
+		$config = getModel('communication')->getConfig();
+		if ($config->enable_message == 'N' || starts_with('dispCommunication', Context::get('act')))
 		{
 			return new Object();
 		}
 
-		if($config->enable_message == 'Y' && $obj->act != 'dispCommunicationNewMessage')
+		$logged_info = Context::get('logged_info');
+		if ($config->enable_message == 'Y')
 		{
 			$flag_path = './files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl);
 			$flag_file = $flag_path . $logged_info->member_srl;