fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

신고 취소전 문서 존재 여부 검사하도록 하고 불필요하게 정수로 만들지 않도록 함.

Browse source 
그리고 신고를 취소할 때 트리거에 신고 카운트변수가 선언되지 않는 문제 고침
This commit is contained in:
BJRambo 2019-08-09 18:48:16 +09:00
parent 7b02e8c080
commit a7af0f9eb8
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/document/document.controller.php
View file

@ -314,13 +314,15 @@ class documentController extends document
$document_srl = intval(Context::get('target_srl')); $document_srl = intval(Context::get('target_srl'));
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl); $oDocument = getModel('document')->getDocument($document_srl);
if(!$document_srl) if(!$oDocument->isExists())
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl);
if($module_info->cancel_vote !== 'Y') if($module_info->cancel_vote !== 'Y')
{ {
throw new Rhymix\Framework\Exception('failed_declared_cancel'); throw new Rhymix\Framework\Exception('failed_declared_cancel');
@ -1664,7 +1666,7 @@ class documentController extends document
} }
// Get currently logged in user. // Get currently logged in user.
$member_srl = intval($this->user->member_srl); $member_srl = $this->user->member_srl;
// Check if document's author is a member. // Check if document's author is a member.
if($oDocument->get('member_srl')) if($oDocument->get('member_srl'))
@ -1782,7 +1784,7 @@ class documentController extends document
*/ */
function declaredDocumentCancel($document_srl) function declaredDocumentCancel($document_srl)
{ {
$member_srl = intval($this->user->member_srl); $member_srl = $this->user->member_srl;
if(!$_SESSION['declared_document'][$document_srl] && $member_srl) if(!$_SESSION['declared_document'][$document_srl] && $member_srl)
{ {
return new BaseObject(-1, 'failed_declared_cancel'); return new BaseObject(-1, 'failed_declared_cancel');
@ -1813,6 +1815,12 @@ class documentController extends document
return new BaseObject(-1, 'failed_declared_cancel'); return new BaseObject(-1, 'failed_declared_cancel');
} }
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQuery('document.getDeclaredDocument', $args);
$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
$trigger_obj = new stdClass(); $trigger_obj = new stdClass();
$trigger_obj->document_srl = $document_srl; $trigger_obj->document_srl = $document_srl;
$trigger_obj->declared_count = $declared_count; $trigger_obj->declared_count = $declared_count;
@ -1823,11 +1831,6 @@ class documentController extends document
return $trigger_output; return $trigger_output;
} }
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQuery('document.getDeclaredDocument', $args);
$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
if($declared_count > 1) if($declared_count > 1)
{ {
$output = executeQuery('document.updateDeclaredDocumentCancel', $args); $output = executeQuery('document.updateDeclaredDocumentCancel', $args);