From 13b69cbf38f70516235799c8c50c114100156a0b Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Sat, 10 Sep 2016 19:31:19 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EC=A7=80=ED=86=B5=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EC=95=8C=EB=A6=BC=EC=9D=B4?=
 =?UTF-8?q?=EC=9E=88=EB=8A=94=20=ED=9A=8C=EC=9B=90=EB=93=A4=EC=9D=98=20?=
 =?UTF-8?q?=EC=BA=90=EC=8B=9C=EB=A5=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ncenterlite/ncenterlite.controller.php    | 31 ++++++++++++-------
 modules/ncenterlite/ncenterlite.model.php     | 17 ++++++++++
 .../queries/getNotifyListByDocumentSrl.xml    | 11 +++++++
 3 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 modules/ncenterlite/queries/getNotifyListByDocumentSrl.xml

diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php
index f010e2cde..48acbae78 100644
--- a/modules/ncenterlite/ncenterlite.controller.php
+++ b/modules/ncenterlite/ncenterlite.controller.php
@@ -446,14 +446,9 @@ class ncenterliteController extends ncenterlite
 		$args = new stdClass();
 		$args->srl = $obj->document_srl;
 		$output = executeQuery('ncenterlite.deleteNotifyBySrl', $args);
-		if($output->toBool())
+		if(!$output->toBool())
 		{
-			//Remove flag files
-			$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->member_srl) . $args->member_srl . '.php';
-			if(file_exists($flag_path))
-			{
-				FileHandler::removeFile($flag_path);
-			}
+			return $output;
 		}
 		return new Object();
 	}
@@ -461,6 +456,17 @@ class ncenterliteController extends ncenterlite
 	function triggerAfterMoveToTrash(&$obj)
 	{
 		$oNcenterliteModel = getModel('ncenterlite');
+		$notify_list = $oNcenterliteModel->getNotifyListByDocumentSrl($obj->document_srl);
+
+		$member_srls = array();
+		foreach($notify_list as $value)
+		{
+			if(!in_array($value->member_srl, $member_srls))
+			{
+				$member_srls = $value->member_srl;
+			}
+		}
+
 		$config = $oNcenterliteModel->getConfig();
 
 		if(empty($config->use))
@@ -473,11 +479,14 @@ class ncenterliteController extends ncenterlite
 		$output = executeQuery('ncenterlite.deleteNotifyBySrl', $args);
 		if($output->toBool())
 		{
-			//Remove flag files
-			$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->member_srl) . $args->member_srl . '.php';
-			if(file_exists($flag_path))
+			foreach($member_srls as $member_srl)
 			{
-				FileHandler::removeFile($flag_path);
+				//Remove flag files
+				$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($member_srl) . $member_srl . '.php';
+				if(file_exists($flag_path))
+				{
+					FileHandler::removeFile($flag_path);
+				}
 			}
 		}
 		return new Object();
diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php
index 7794d386f..421acf185 100644
--- a/modules/ncenterlite/ncenterlite.model.php
+++ b/modules/ncenterlite/ncenterlite.model.php
@@ -457,4 +457,21 @@ class ncenterliteModel extends ncenterlite
 
 		return zdate($datetime, 'Y-m-d');
 	}
+
+	function getNotifyListByDocumentSrl($document_srl = null)
+	{
+		if($document_srl === null)
+		{
+			return false;
+		}
+		$args = new stdClass();
+		$args->document_srl = $document_srl;
+		$output = executeQueryArray('ncenterlite.getNotifyListByDocumentSrl', $args);
+		if(!$output->toBool())
+		{
+			return $output;
+		}
+
+		return $output->data;
+	}
 }
diff --git a/modules/ncenterlite/queries/getNotifyListByDocumentSrl.xml b/modules/ncenterlite/queries/getNotifyListByDocumentSrl.xml
new file mode 100644
index 000000000..565f223c8
--- /dev/null
+++ b/modules/ncenterlite/queries/getNotifyListByDocumentSrl.xml
@@ -0,0 +1,11 @@
+<query id="getNotifyListByDocumentSrl" action="select">
+	<tables>
+		<table name="ncenterlite_notify" />
+	</tables>
+	<columns>
+		<column name="*" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="srl" var="document_srl" filter="number" notnull="notnull" />
+	</conditions>
+</query>