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

코드 리뷰 요청에 대한 코드 수정

Browse source 
1. 신고를 취소할 경우 document_srl 먼저 검사하도록 수정
2. 신고 취소시 트리거와 신고 카운트를 가져오는 항목을 취소가능한 상태를 완벽하게 확인하고 트리거 실행하도록 함
3. 로그인 한 상태이라면 세션만 검사하여 리턴 시키지 않고 한번 더 디비로 검사하도로 개선
This commit is contained in:
BJRambo 2019-08-09 18:10:42 +09:00
parent ef1e18caf8
commit d477811a8b
1 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -316,15 +316,15 @@ class documentController extends document
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl);
if($module_info->cancel_vote !== 'Y')
{
throw new Rhymix\Framework\Exception('failed_declared_cancel');
}
if(!$document_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
if($module_info->cancel_vote !== 'Y')
{
throw new Rhymix\Framework\Exception('failed_declared_cancel');
}
if(Context::get('success_return_url'))
{
@ -1782,32 +1782,12 @@ class documentController extends document
*/
function declaredDocumentCancel($document_srl)
{
if(!$_SESSION['declared_document'][$document_srl])
$member_srl = intval($this->user->member_srl);
if(!$_SESSION['declared_document'][$document_srl] && $member_srl)
{
return new BaseObject(-1, 'failed_declared_cancel');
}
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQuery('document.getDeclaredDocument', $args);
if(!$output->toBool())
{
return $output;
}
$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
$trigger_obj = new stdClass();
$trigger_obj->document_srl = $document_srl;
$trigger_obj->declared_count = $declared_count;
// Call a trigger (before)
$trigger_output = ModuleHandler::triggerCall('document.declaredDocumentCancel', 'before', $trigger_obj);
if(!$trigger_output->toBool())
{
return $trigger_output;
}
// Get the original document
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
@ -1815,8 +1795,6 @@ class documentController extends document
$oDB = DB::getInstance();
$oDB->begin();
$member_srl = intval($this->user->member_srl);
$args = new stdClass;
$args->document_srl = $document_srl;
if($member_srl)
@ -1834,7 +1812,22 @@ class documentController extends document
$_SESSION['declared_document'][$document_srl] = false;
return new BaseObject(-1, 'failed_declared_cancel');
}
$trigger_obj = new stdClass();
$trigger_obj->document_srl = $document_srl;
$trigger_obj->declared_count = $declared_count;
// Call a trigger (before)
$trigger_output = ModuleHandler::triggerCall('document.declaredDocumentCancel', 'before', $trigger_obj);
if(!$trigger_output->toBool())
{
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)
{
$output = executeQuery('document.updateDeclaredDocumentCancel', $args);