From adb68347efb48086a3f4ae6397c59755e0e9e418 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Thu, 8 Aug 2019 17:00:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B3=A0=EC=B7=A8=EC=86=8C=EC=8B=9C?=
 =?UTF-8?q?=20=EC=84=B8=EC=85=98=20=EA=B2=80=EC=82=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/document/document.controller.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index d42a5bb5b..1eb67ff35 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -63,7 +63,8 @@ class documentController extends document
 				throw new Rhymix\Framework\Exceptions\NotPermitted;
 			}
 		}
-		if($this->module_info->cancel_vote !=='Y')
+		
+		if($this->module_info->cancel_vote !== 'Y')
 		{
 			throw new Rhymix\Framework\Exception('failed_voted_cancel');
 		}
@@ -157,7 +158,7 @@ class documentController extends document
 			}
 		}
 
-		if($this->module_info->cancel_vote !=='Y')
+		if($this->module_info->cancel_vote !== 'Y')
 		{
 			return new Rhymix\Framework\Exception('failed_voted_canceled');
 		}
@@ -311,6 +312,11 @@ class documentController extends document
 			throw new Rhymix\Framework\Exceptions\MustLogin;
 		}
 
+		if($this->module_info->cancel_vote !== 'Y')
+		{
+			throw new Rhymix\Framework\Exception('failed_voted_cancel');
+		}
+
 		$document_srl = intval(Context::get('target_srl'));
 		if(!$document_srl)
 		{
@@ -1773,6 +1779,11 @@ class documentController extends document
 	 */
 	function declaredDocumentCancel($document_srl)
 	{
+		if(!$_SESSION['declared_document'][$document_srl])
+		{
+			return new BaseObject(-1, 'failed_declared_cancel');
+		}
+		
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);