스패머 처리시 댓글이 휴지통으로 들어가지 않는 문제 수정

스패머 처리시 휴지통 이동을 기본값으로 함
This commit is contained in:
conory 2021-09-04 01:47:47 +09:00
parent c5138ab477
commit ca5eb517cf
2 changed files with 20 additions and 11 deletions

View file

@ -3681,9 +3681,7 @@ class memberController extends member
$module_srl = Context::get('module_srl');
$cnt_loop = Context::get('cnt_loop');
$proc_type = Context::get('proc_type');
$isMoveToTrash = true;
if($proc_type == "delete")
$isMoveToTrash = false;
$isMoveToTrash = ($proc_type !== 'delete') ? true : false;
// check grant
$columnList = array('module_srl', 'module');
@ -3692,8 +3690,6 @@ class memberController extends member
if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted;
$proc_msg = "";
// delete or trash destination
// proc member
if($cnt_loop == 1)
@ -3774,7 +3770,7 @@ class memberController extends member
*
* @return object
**/
protected function _spammerDocuments($member_srl, $isMoveToTrash)
protected function _spammerDocuments($member_srl, $isMoveToTrash = true)
{
$oDocumentController = getController('document');
$oCommentController = getController('comment');
@ -3791,7 +3787,14 @@ class memberController extends member
$commentList = CommentModel::getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
if($commentList) {
foreach($commentList as $v) {
$oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash);
if($isMoveToTrash)
{
$oCommentController->moveCommentToTrash($v);
}
else
{
$oCommentController->deleteComment($v->comment_srl, true);
}
}
}
} elseif($cnt_document > 0) {
@ -3799,8 +3802,14 @@ class memberController extends member
$documentList = DocumentModel::getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
if($documentList) {
foreach($documentList as $v) {
if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
else $oDocumentController->deleteDocument($v->document_srl);
if($isMoveToTrash)
{
$oDocumentController->moveDocumentToTrash($v);
}
else
{
$oDocumentController->deleteDocument($v->document_srl, true);
}
}
}
}

View file

@ -27,7 +27,7 @@
<textarea name="spam_description" id="spam_description" cols="400" rows="3"></textarea>
</div>
<div class="btn-proc" >
<label for="to_trash"><input type="checkbox" name="to_trash" value="Y" id="to_trash" />{$lang->spammer_move_to_trash}</label>
<label for="to_trash"><input type="checkbox" name="to_trash" value="Y" checked="checked" id="to_trash" />{$lang->spammer_move_to_trash}</label>
<button class="x_btn x_btn-danger" type="submit"/>{$lang->btn_spammer_delete_all}</button>
</div>
@ -57,7 +57,7 @@ function doSpammerManage( args ) {
// reset form
args.proc_type = "trash";
if( jQuery('#to_trash').attr( 'checked' ) != "checked" )
args.proc_type = "hidden";
args.proc_type = "delete";
args.cnt_loop =1;