From 3f620481cfe1498c1e76df969366aebfb0a8b2b0 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 31 Jul 2020 13:41:35 +0900
Subject: [PATCH] Clean up vote cancel functions and ensure consistency between
 document and comment modules #1367

---
 modules/comment/comment.controller.php   | 13 ++++++++-----
 modules/document/document.controller.php |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index f60af2b09..88f2e3e26 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -162,15 +162,18 @@ class commentController extends comment
 
 	function updateVotedCountCancel($comment_srl, $oComment, $point)
 	{
-		$logged_info = Context::get('logged_info');
+		if(!$_SESSION['voted_comment'][$comment_srl] && !$this->user->member_srl)
+		{
+			return new BaseObject(-1, $point > 0 ? 'failed_voted_canceled' : 'failed_blamed_canceled');
+		}
 		
 		// Check if the current user has voted previously.
 		$args = new stdClass;
 		$args->comment_srl = $comment_srl;
 		$args->point = $point;
-		if($logged_info->member_srl)
+		if($this->user->member_srl)
 		{
-			$args->member_srl = $logged_info->member_srl;
+			$args->member_srl = $this->user->member_srl;
 		}
 		else
 		{
@@ -206,7 +209,7 @@ class commentController extends comment
 		$args = new stdClass();
 		$d_args = new stdClass();
 		$args->comment_srl = $d_args->comment_srl = $comment_srl;
-		$d_args->member_srl = $logged_info->member_srl;
+		$d_args->member_srl = $this->user->member_srl;
 		if ($trigger_obj->update_target === 'voted_count')
 		{
 			$args->voted_count = $trigger_obj->after_point;
@@ -221,7 +224,7 @@ class commentController extends comment
 		if(!$d_output->toBool()) return $d_output;
 
 		//session reset
-		$_SESSION['voted_comment'][$comment_srl] = false;
+		unset($_SESSION['voted_comment'][$comment_srl]);
 		
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('comment.updateVotedCountCancel', 'after', $trigger_obj);
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index af1a4c13d..687d78795 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -273,7 +273,7 @@ class documentController extends document
 			if(!$d_output->toBool()) return $d_output;
 		}
 		// session reset
-		$_SESSION['voted_document'][$document_srl] = false;
+		unset($_SESSION['voted_document'][$document_srl]);
 
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('document.updateVotedCountCancel', 'after', $trigger_obj);