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

Merge pull request #6 from xpressengine/develop

Browse source 
Develop
This commit is contained in:
izuzero 2014-05-28 03:54:38 +09:00
commit c6eafb94da
41 changed files with 207 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -234,7 +234,7 @@ class documentController extends document
if(!$output->toBool()) return $output;
// Register it if no given document_srl exists
if(!$obj->document_srl) $obj->document_srl = getNextSequence();
elseif(!checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
$oDocumentModel = getModel('document');
// Set to 0 if the category_srl doesn't exist
@ -1146,14 +1146,19 @@ class documentController extends document
$_SESSION['voted_document'][$document_srl] = true;
// Return result
$output = new Object();
if($point > 0)
{
return new Object(0, 'success_voted');
$output->setMessage('success_voted');
$output->add('voted_count', $obj->after_point);
}
else
{
return new Object(0, 'success_blamed');
$output->setMessage('success_blamed');
$output->add('blamed_count', $obj->after_point);
}
return $output;
}
/**