From 43a6caeb3694d3b928c5f5bc5e668f9c18b4a855 Mon Sep 17 00:00:00 2001 From: qw5414 Date: Fri, 22 Jan 2016 13:07:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EC=B2=9C/=EB=B9=84=EC=B6=94=EC=B2=9C?= =?UTF-8?q?=20=EC=9D=B8=EC=8B=9D=20=EB=B0=A9=EB=B2=95=EC=9D=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=ED=95=98=EA=B3=A0=20=EA=B7=B8=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/skins/xedition/_read.html | 2 +- modules/document/document.controller.php | 12 ++++++---- modules/document/document.item.php | 24 +++++++++++++------ .../queries/deleteDocumentVotedLog.xml | 1 + .../document/queries/getDocumentVotedLog.xml | 15 ++++++++++++ 5 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 modules/document/queries/getDocumentVotedLog.xml diff --git a/modules/board/skins/xedition/_read.html b/modules/board/skins/xedition/_read.html index ef8b42aad..52d9c8c2a 100644 --- a/modules/board/skins/xedition/_read.html +++ b/modules/board/skins/xedition/_read.html @@ -85,7 +85,7 @@ diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index c78bf8dea..55893ada5 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -57,15 +57,18 @@ class documentController extends document { return new Object(-1, 'msg_document_voted_cancel_not'); } + $logged_info = Context::get('logged_info'); $args = new stdClass(); $d_args = new stdClass(); $args->document_srl = $d_args->document_srl = $document_srl; + $d_args->member_srl = $logged_info->member_srl; $args->voted_count = $oDocument->get('voted_count') - 1; $output = executeQuery('document.updateVotedCount', $args); $d_output = executeQuery('document.deleteDocumentVotedLog', $d_args); //session reset $_SESSION['voted_document'][$document_srl] = false; + $output->setMessage('success_voted_canceled'); return $output; } @@ -1201,7 +1204,7 @@ class documentController extends document } // Use member_srl for logged-in members and IP address for non-members. - $args = new stdClass; + $args = new stdClass(); if($member_srl) { $args->member_srl = $member_srl; @@ -1227,11 +1230,15 @@ class documentController extends document if($point < 0) { $args->blamed_count = $oDocument->get('blamed_count') + $point; + // Leave in the session information + $_SESSION['voted_document'][$document_srl] = -1; $output = executeQuery('document.updateBlamedCount', $args); } else { $args->voted_count = $oDocument->get('voted_count') + $point; + // Leave in the session information + $_SESSION['voted_document'][$document_srl] = 1; $output = executeQuery('document.updateVotedCount', $args); } if(!$output->toBool()) return $output; @@ -1265,9 +1272,6 @@ class documentController extends document $oCacheHandler->delete($cache_key); } - // Leave in the session information - $_SESSION['voted_document'][$document_srl] = true; - // Return result $output = new Object(); if($point > 0) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index fc302d029..54cb14917 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -372,19 +372,29 @@ class documentItem extends Object function getVoted() { if(!$this->document_srl) return; + if($_SESSION['voted_document'][$this->document_srl] == '1') + { + return 'voted'; + } + else if($_SESSION['voted_document'][$this->document_srl] == '-1') + { + return 'blamed'; + } $logged_info = Context::get('logged_info'); - $member_srl = $logged_info->member_srl; - $document_srl = $this->document_srl; $args = new stdClass(); - $args->member_srl = $member_srl; - $args->document_srl = $document_srl; - $output = executeQuery('document.getDocumentVotedLogInfo', $args); + $args->member_srl = $logged_info->member_srl; + $args->document_srl = $this->document_srl; + $output = executeQuery('document.getDocumentVotedLog', $args); - if($output->data->count) + if($output->data->point === '1') { - return true; + return 'voted'; + } + else if($output->data->point === '-1') + { + return 'blamed'; } return false; diff --git a/modules/document/queries/deleteDocumentVotedLog.xml b/modules/document/queries/deleteDocumentVotedLog.xml index bd550122c..04e92a317 100644 --- a/modules/document/queries/deleteDocumentVotedLog.xml +++ b/modules/document/queries/deleteDocumentVotedLog.xml @@ -4,5 +4,6 @@ + diff --git a/modules/document/queries/getDocumentVotedLog.xml b/modules/document/queries/getDocumentVotedLog.xml new file mode 100644 index 000000000..a990bc108 --- /dev/null +++ b/modules/document/queries/getDocumentVotedLog.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + +