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

Merge pull request #173 from misol/improvement/charge-with-something

Browse source 
신고/계정 거부에 이유를 적을 수 있게 하는 PR
This commit is contained in:
MinSoo Kim 2016-01-29 10:26:47 +09:00
commit 6b263844ad
38 changed files with 887 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,12 +192,30 @@ class documentController extends document
*/
function procDocumentDeclare()
{
if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
if(!Context::get('is_logged'))
{
return new Object(-1, 'msg_not_logged');
}
$document_srl = Context::get('target_srl');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
$document_srl = intval(Context::get('target_srl'));
if(!$document_srl)
{
return new Object(-1, 'msg_invalid_request');
}
return $this->declaredDocument($document_srl);
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_document_reasons = Context::getLang('improper_document_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_document_reasons[$message_option]))?
$improper_document_reasons[$message_option] : trim(Context::get('declare_message'));
// if there is return url, set that.
if(Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
return $this->declaredDocument($document_srl, $declare_message);
}
/**
@ -1359,18 +1377,25 @@ class documentController extends document
/**
* Report posts
* @param int $document_srl
* @param string $declare_message
* @return void|Object
*/
function declaredDocument($document_srl)
function declaredDocument($document_srl, $declare_message = '')
{
// Fail if session information already has a reported document
if($_SESSION['declared_document'][$document_srl]) return new Object(-1, 'failed_declared');
if($_SESSION['declared_document'][$document_srl])
{
return new Object(-1, 'failed_declared');
}
// Check if previously reported
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQuery('document.getDeclaredDocument', $args);
if(!$output->toBool()) return $output;
if(!$output->toBool())
{
return $output;
}
$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
@ -1390,7 +1415,8 @@ class documentController extends document
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
// Pass if the author's IP address is as same as visitor's.
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
{
$_SESSION['declared_document'][$document_srl] = true;
return new Object(-1, 'failed_declared');
}
@ -1421,6 +1447,7 @@ class documentController extends document
}
$args->document_srl = $document_srl;
$args->declare_message = trim(htmlspecialchars($declare_message));
$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
// Pass after registering a sesson if reported/declared documents are in the logs.
@ -1435,9 +1462,21 @@ class documentController extends document
$oDB->begin();
// Add the declared document
if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
else $output = executeQuery('document.insertDeclaredDocument', $args);
if(!$output->toBool()) return $output;
if($declared_count > 0)
{
$output = executeQuery('document.updateDeclaredDocument', $args);
}
else
{
$output = executeQuery('document.insertDeclaredDocument', $args);
}
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
// Leave logs
$output = executeQuery('document.insertDocumentDeclaredLog', $args);
if(!$output->toBool())
@ -1446,7 +1485,7 @@ class documentController extends document
return $output;
}
$this->add('declared_count', $declared_count+1);
$this->add('declared_count', $declared_count + 1);
// Call a trigger (after)
$trigger_obj->declared_count = $declared_count + 1;