diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index b03672d17..65cf51bd8 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -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); + } } } } diff --git a/modules/member/tpl/spammer.html b/modules/member/tpl/spammer.html index c7dd3b8fa..265519e61 100644 --- a/modules/member/tpl/spammer.html +++ b/modules/member/tpl/spammer.html @@ -27,7 +27,7 @@
- +
@@ -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;