fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 07:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1204 #407 display more helpful error message when a post cannot be upvoted/downvoted/reported for whatever reason

Browse source
This commit is contained in:
Kijin Sung 2023-09-25 22:32:17 +09:00
parent a6f918fbf9
commit 3c415e18d5
4 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/comment/comment.controller.php
View file

@ -266,7 +266,8 @@ class CommentController extends Comment
function updateVotedCountCancel($comment_srl, $oComment, $point)
{
if(!$_SESSION['voted_comment'][$comment_srl] && !$this->user->member_srl)
// Guests can only cancel votes that are registered in the current session.
if(!$this->user->member_srl && empty($_SESSION['voted_comment'][$comment_srl]))
{
return new BaseObject(-1, $point > 0 ? 'failed_voted_canceled' : 'failed_blamed_canceled');
}
@ -1568,9 +1569,9 @@ class CommentController extends Comment
}
// invalid vote if vote info exists in the session info.
if($_SESSION['voted_comment'][$comment_srl])
if(!empty($_SESSION['voted_comment'][$comment_srl]))
{
return new BaseObject(-1, $failed_voted);
return new BaseObject(-1, $failed_voted . '_already');
}
// Get the original comment
@ -1592,7 +1593,7 @@ class CommentController extends Comment
if($member_srl && $member_srl == abs($oComment->get('member_srl')))
{
$_SESSION['voted_comment'][$comment_srl] = false;
return new BaseObject(-1, $failed_voted);
return new BaseObject(-1, $failed_voted . '_self');
}
}
@ -1687,9 +1688,9 @@ class CommentController extends Comment
function declaredComment($comment_srl, $declare_message)
{
// Fail if session information already has a reported document
if(isset($_SESSION['declared_comment'][$comment_srl]))
if(!empty($_SESSION['declared_comment'][$comment_srl]))
{
return new BaseObject(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared_already');
}
// check if already reported
@ -1738,7 +1739,7 @@ class CommentController extends Comment
if($member_srl && $member_srl == abs($oComment->get('member_srl')))
{
$_SESSION['declared_comment'][$comment_srl] = FALSE;
return new BaseObject(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared_self');
}
}
@ -1757,7 +1758,7 @@ class CommentController extends Comment
if($log_output->data->count)
{
$_SESSION['declared_comment'][$comment_srl] = FALSE;
return new BaseObject(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared_already');
}
// Fill in remaining information for logging.

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

@ -285,7 +285,8 @@ class DocumentController extends Document
*/
function updateVotedCountCancel($document_srl, $oDocument, $point)
{
if(!$_SESSION['voted_document'][$document_srl] && !$this->user->member_srl)
// Guests can only cancel votes that are registered in the current session.
if(!$this->user->member_srl && empty($_SESSION['voted_document'][$document_srl]))
{
return new BaseObject(-1, $point > 0 ? 'failed_voted_canceled' : 'failed_blamed_canceled');
}
@ -1800,9 +1801,9 @@ class DocumentController extends Document
}
// Return fail if session already has information about votes
if($_SESSION['voted_document'][$document_srl])
if(!empty($_SESSION['voted_document'][$document_srl]))
{
return new BaseObject(-1, $failed_voted);
return new BaseObject(-1, $failed_voted . '_already');
}
// Get the original document
@ -1824,7 +1825,7 @@ class DocumentController extends Document
if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
{
$_SESSION['voted_document'][$document_srl] = false;
return new BaseObject(-1, $failed_voted);
return new BaseObject(-1, $failed_voted . '_self');
}
}
@ -1931,9 +1932,9 @@ class DocumentController extends Document
function declaredDocument($document_srl, $declare_message = '')
{
// Fail if session already tried to report the document
if(isset($_SESSION['declared_document'][$document_srl]))
if(!empty($_SESSION['declared_document'][$document_srl]))
{
return new BaseObject(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared_already');
}
// Check if previously reported
@ -1982,7 +1983,7 @@ class DocumentController extends Document
if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
{
$_SESSION['declared_document'][$document_srl] = false;
return new BaseObject(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared_self');
}
}
@ -2001,7 +2002,7 @@ class DocumentController extends Document
if($output->data->count)
{
$_SESSION['declared_document'][$document_srl] = false;
return new BaseObject(-1, 'failed_declared');
return new BaseObject(-1, 'failed_declared_already');
}
// Fill in remaining information for logging.