From ad76cc030f3d324c15c3e83001ea482014671988 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Tue, 4 Feb 2020 12:31:01 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=EA=B8=80=20=EB=8C=93=EA=B8=80=EC=95=8C=EB=A6=BC=20=EC=B0=A8?=
 =?UTF-8?q?=EB=8B=A8=ED=95=98=EA=B3=A0=20=EC=9D=BC=EB=B6=80=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ncenterlite/ncenterlite.controller.php    | 26 ++++++++++++++++---
 modules/ncenterlite/ncenterlite.model.php     |  4 +--
 modules/ncenterlite/ncenterlite.view.php      |  4 +--
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php
index 3e9bca46d..eb1fa8c64 100644
--- a/modules/ncenterlite/ncenterlite.controller.php
+++ b/modules/ncenterlite/ncenterlite.controller.php
@@ -90,11 +90,11 @@ class ncenterliteController extends ncenterlite
 		$obj = Context::getRequestVars();
 		if($obj->individual_srl)
 		{
-			$userBlockData = $oNcenterliteModel->getUserIndividualBlockConfigByIndividualSrl($obj->individual_srl)->data;
+			$userBlockData = $oNcenterliteModel->getUserIndividualBlockConfigByIndividualSrl($obj->individual_srl);
 		}
 		else if($obj->target_srl)
 		{
-			$userBlockData = $oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($obj->target_srl, $member_srl)->data;
+			$userBlockData = $oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($obj->target_srl, $member_srl);
 		}
 		
 		if($obj->individual_type == 'document')
@@ -252,6 +252,7 @@ class ncenterliteController extends ncenterlite
 
 	function triggerAfterInsertComment($obj)
 	{
+		/** @var ncenterliteModel $oNcenterliteModel */
 		$oNcenterliteModel = getModel('ncenterlite');
 		$config = $oNcenterliteModel->getConfig();
 
@@ -270,6 +271,7 @@ class ncenterliteController extends ncenterlite
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
+		// 댓글을 남긴 이력이 있는 회원들에게만 알림을 전송
 		if($config->comment_all == 'Y' && $obj->member_srl == $oDocument->get('member_srl') && !$obj->parent_srl && (is_array($config->comment_all_notify_module_srls) && in_array($module_info->module_srl, $config->comment_all_notify_module_srls)))
 		{
 			$comment_args = new stdClass();
@@ -282,6 +284,7 @@ class ncenterliteController extends ncenterlite
 				{
 					continue;
 				}
+				
 				$args = new stdClass();
 				$args->config_type = 'comment_all';
 				$args->member_srl = $value->member_srl;
@@ -308,6 +311,7 @@ class ncenterliteController extends ncenterlite
 		$obj->admin_comment_notify = false;
 		$admin_list = $oNcenterliteModel->getMemberAdmins();
 
+		// 관리자에게 알림을 전송
 		if(isset($config->use['admin_content']) && is_array($config->admin_notify_module_srls) && in_array($module_info->module_srl, $config->admin_notify_module_srls))
 		{
 			foreach($admin_list as $admins)
@@ -343,7 +347,6 @@ class ncenterliteController extends ncenterlite
 			}
 		}
 
-		// check use the mention option.
 		$notify_member_srls = array();
 		if(isset($config->use['mention']))
 		{
@@ -388,6 +391,18 @@ class ncenterliteController extends ncenterlite
 				{
 					return;
 				}
+				
+				// 받는 사람이 문서를 차단하고 있을 경우
+				if($oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($document_srl, $abs_member_srl))
+				{
+					return;
+				}
+				
+				if($oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($parent_srl, $abs_member_srl))
+				{
+					return;
+				}
+				
 				$args = new stdClass();
 				$args->config_type = 'comment_comment';
 				$args->member_srl = $abs_member_srl;
@@ -421,6 +436,11 @@ class ncenterliteController extends ncenterlite
 				return;
 			}
 
+			if($oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($document_srl, $abs_member_srl))
+			{
+				return;
+			}
+			
 			if($config->user_notify_setting == 'Y')
 			{
 				$comment_member_config = $oNcenterliteModel->getUserConfig($abs_member_srl);
diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php
index dd912774f..43b189186 100644
--- a/modules/ncenterlite/ncenterlite.model.php
+++ b/modules/ncenterlite/ncenterlite.model.php
@@ -676,7 +676,7 @@ class ncenterliteModel extends ncenterlite
 		$args->individual_srl = $individual_srl;
 		$output = executeQuery('ncenterlite.getUserIndividualBlockConfigByIndividualSrl', $args);
 
-		return $output;
+		return $output->data;
 	}
 
 	function getUserIndividualBlockConfigByTargetSrl($target_srl = 0, $member_srl = null)
@@ -691,6 +691,6 @@ class ncenterliteModel extends ncenterlite
 		$args->member_srl = $member_srl;
 		$output = executeQuery('ncenterlite.getUserIndividualBlockConfigByTargetSrl', $args);
 
-		return $output;
+		return $output->data;
 	}
 }
diff --git a/modules/ncenterlite/ncenterlite.view.php b/modules/ncenterlite/ncenterlite.view.php
index 160b97652..e26f1fd59 100644
--- a/modules/ncenterlite/ncenterlite.view.php
+++ b/modules/ncenterlite/ncenterlite.view.php
@@ -131,7 +131,7 @@ class ncenterliteView extends ncenterlite
 		}
 		
 		
-		if((!$target_srl || !$individual_type) && !$output->data)
+		if((!$target_srl || !$individual_type) && !$output)
 		{
 			throw new Rhymix\Framework\Exceptions\InvalidRequest;
 		}
@@ -174,7 +174,7 @@ class ncenterliteView extends ncenterlite
 			}
 		}
 		
-		Context::set('individualData', $output->data);
+		Context::set('individualData', $output);
 		Context::set('text', $text);
 		Context::set('type', $type);