From 76b629860fed9816b8968087eb70748d78bd8584 Mon Sep 17 00:00:00 2001
From: BJRambo
Date: Thu, 26 May 2016 20:49:08 +0900
Subject: [PATCH] Add the delete placeholder feature.
---
modules/board/board.controller.php | 11 +++++++++--
modules/board/lang/en.php | 1 +
modules/board/lang/ko.php | 1 +
modules/board/skins/xedition/_comment.html | 3 +++
modules/board/skins/xedition/delete_comment_form.html | 7 ++++++-
modules/board/skins/xedition/delete_form.html | 2 +-
6 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index b6885f8c4..0d2736b06 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -482,6 +482,13 @@ class boardController extends board
{
// get the comment_srl
$comment_srl = Context::get('comment_srl');
+
+ $perfect_delete = null;
+ if($this->grant->manager == true)
+ {
+ $perfect_delete = Context::get('perfect_delete');
+ }
+
if(!$comment_srl)
{
return new Object(-1, 'msg_invalid_request');
@@ -510,13 +517,13 @@ class boardController extends board
// generate comment controller object
$oCommentController = getController('comment');
- if($this->module_info->comment_delete_message === 'yes')
+ if($this->module_info->comment_delete_message === 'yes' && $perfect_delete != 'Y')
{
$comment->content = '';
$comment->status = 7;
$output = $oCommentController->updateCommentByDelete($comment, $this->grant->manager);
}
- elseif($this->module_info->comment_delete_message === 'only_commnet')
+ elseif($this->module_info->comment_delete_message === 'only_commnet' && $perfect_delete != 'Y')
{
$childs = $oCommentModel->getChildComments($comment_srl);
if(count($childs) > 0)
diff --git a/modules/board/lang/en.php b/modules/board/lang/en.php
index a54441ad6..303b1171f 100644
--- a/modules/board/lang/en.php
+++ b/modules/board/lang/en.php
@@ -47,3 +47,4 @@ $lang->about_comment_delete_message = 'When a comment is deleted, leave a placeh
$lang->cmd_only_p_comment = 'Only if there are replies';
$lang->cmd_all_comment_message = 'Always';
$lang->cmd_do_not_message = 'Never';
+$lang->delete_placeholder = 'Delete Placeholder';
diff --git a/modules/board/lang/ko.php b/modules/board/lang/ko.php
index 44f25a105..b7a7a36e4 100644
--- a/modules/board/lang/ko.php
+++ b/modules/board/lang/ko.php
@@ -76,3 +76,4 @@ $lang->about_comment_delete_message = '댓글 삭제시 완전히 지우지 않
$lang->cmd_only_p_comment = '대댓글이 있는 경우에만 남김';
$lang->cmd_all_comment_message = '모든 댓글에 남김';
$lang->cmd_do_not_message = '남기지 않음';
+$lang->delete_placeholder = '완전 삭제';
diff --git a/modules/board/skins/xedition/_comment.html b/modules/board/skins/xedition/_comment.html
index f90bcb7cf..14a2160e3 100644
--- a/modules/board/skins/xedition/_comment.html
+++ b/modules/board/skins/xedition/_comment.html
@@ -52,6 +52,9 @@
{$lang->cmd_delete}
+
+ {$lang->delete_placeholder}
+
-
\ No newline at end of file
+