From 76b629860fed9816b8968087eb70748d78bd8584 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 26 May 2016 20:49:08 +0900 Subject: [PATCH 01/25] 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->cmd_comment_do}

+

+ {$lang->delete_placeholder} +

- \ No newline at end of file + From 52d8987c158bb0c20627cf5a1f970f9209bc8ddd Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 26 May 2016 21:00:44 +0900 Subject: [PATCH 02/25] Fix the manager permission --- modules/board/skins/xedition/_comment.html | 2 +- modules/board/skins/xedition/delete_comment_form.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/board/skins/xedition/_comment.html b/modules/board/skins/xedition/_comment.html index 14a2160e3..d011c3f07 100644 --- a/modules/board/skins/xedition/_comment.html +++ b/modules/board/skins/xedition/_comment.html @@ -53,7 +53,7 @@ {$lang->cmd_comment_do}

- {$lang->delete_placeholder} + {$lang->delete_placeholder}

diff --git a/modules/board/skins/xedition/delete_comment_form.html b/modules/board/skins/xedition/delete_comment_form.html index bf756199e..a54c7d50d 100644 --- a/modules/board/skins/xedition/delete_comment_form.html +++ b/modules/board/skins/xedition/delete_comment_form.html @@ -14,8 +14,8 @@

{sprintf($lang->comfirm_act_msg,$lang->comment,$lang->cmd_delete,$lang->msg_eul)}

-
- +
- - +

{$lang->ncenterlite_display_about}

From c65211d13d4938e6b309c0c6a70ceb905300ca1b Mon Sep 17 00:00:00 2001 From: BJRambo Date: Mon, 30 May 2016 08:36:29 +0900 Subject: [PATCH 23/25] setting the always use as the diplay_use default setting. --- modules/ncenterlite/ncenterlite.model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index cf4fae036..2e5f1ba44 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -20,7 +20,7 @@ class ncenterliteModel extends ncenterlite { $config->use = array('message' => 1); } - if(!$config->display_use) $config->display_use = 'Y'; + if(!$config->display_use) $config->display_use = 'all'; if(!$config->mention_names) $config->mention_names = 'nick_name'; if(!$config->mention_suffixes) From 57966ff9faa77286c6a6162b9505e6b96d401d81 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Mon, 30 May 2016 08:48:12 +0900 Subject: [PATCH 24/25] add the ncenter setting use in widget setting --- layouts/xedition/layout.html | 2 +- widgets/login_info/conf/info.xml | 16 ++++++++++++++++ widgets/login_info/login_info.class.php | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index f3d5dd94b..dcd02c047 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -442,7 +442,7 @@ - + diff --git a/widgets/login_info/conf/info.xml b/widgets/login_info/conf/info.xml index 2d600b9d0..11e32c680 100644 --- a/widgets/login_info/conf/info.xml +++ b/widgets/login_info/conf/info.xml @@ -31,4 +31,20 @@ NAVER NAVER + + + 알림센터 사용 + Use the ncenterlite + + yes + 사용함 + Enabled + + + no + 사용 안 함 + Disabled + + + diff --git a/widgets/login_info/login_info.class.php b/widgets/login_info/login_info.class.php index d91ffe8a1..ea7159dc0 100644 --- a/widgets/login_info/login_info.class.php +++ b/widgets/login_info/login_info.class.php @@ -30,7 +30,7 @@ class login_info extends WidgetHandler $ncenter_config = $oNcenterliteModel->getConfig(); if($is_logged) { - if(!empty($ncenter_config->use)) + if(!empty($ncenter_config->use) && $args->ncenter_use == 'yes') { $logged_info = Context::get('logged_info'); $ncenter_list = $oNcenterliteModel->getMyNotifyList($logged_info->member_srl); From aa577a8292032000d71ef81dc1b0ac169fa45ca8 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Mon, 30 May 2016 08:53:19 +0900 Subject: [PATCH 25/25] Apply multiple language in login form. --- widgets/login_info/skins/ncenter_login/login_form.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/login_info/skins/ncenter_login/login_form.html b/widgets/login_info/skins/ncenter_login/login_form.html index 0d79653e3..cd134aa97 100644 --- a/widgets/login_info/skins/ncenter_login/login_form.html +++ b/widgets/login_info/skins/ncenter_login/login_form.html @@ -30,10 +30,10 @@

{$lang->cmd_login}

- - + + - +