diff --git a/modules/ncenterlite/conf/module.xml b/modules/ncenterlite/conf/module.xml index df246147a..f56580f36 100644 --- a/modules/ncenterlite/conf/module.xml +++ b/modules/ncenterlite/conf/module.xml @@ -19,6 +19,7 @@ + diff --git a/modules/ncenterlite/lang/ko.php b/modules/ncenterlite/lang/ko.php index 8323efe28..70f88adff 100644 --- a/modules/ncenterlite/lang/ko.php +++ b/modules/ncenterlite/lang/ko.php @@ -39,6 +39,9 @@ $lang->ncenterlite_activate = '사용'; $lang->ncenterlite_inactivate = '사용 안함'; $lang->ncenterlite_userconfig_about_warning = '주의! 당신은 관리자 권한으로 다른 사용자의 설정창에 접속하였습니다.'; $lang->ncenterlite_comment_all = '모든 댓글 작성자에게 알림'; +$lang->ncenterlite_comment_all_setting = '댓글 작성자 알림 설정'; +$lang->ncenterlite_comment_all_select_mid = '댓글 작성자 알림 사용 모듈'; +$lang->ncenterlite_about_comment_all_select_mid = '댓글 작성자 알림을 사용하실 모듈을 선택하세요. 모두 선택 해제시 기능이 작동하지 않습니다.'; $lang->ncenterlite_article = '%1$s님이 "%2$s"라고 글을 남겼습니다.'; $lang->ncenterlite_board = '%1$s님이 "%2$s" 게시판에 "%3$s"라고 글을 남겼습니다.'; $lang->ncenterlite_commented = '%1$s님이 회원님의 %2$s에 "%3$s"라고 댓글을 남겼습니다.'; @@ -52,7 +55,6 @@ $lang->ncenterlite_vote = '%s님이 회원님의 "%s"ncenterlite_vote_anonymous = '회원님의 "%s" %s이 추천되었습니다.'; $lang->ncenterlite_admin_content_message = '%1$s님이 "%2$s" 게시판에 "%3$s"라고 글을 남겼습니다.'; $lang->ncenterlite_insert_member_message = '%s회원가입을 환영합니다!!'; -$lang->ncenterlite_insert_comment_all_message = '게시글 작성자 %s님이 "%2$s"게시글에 댓글을 남겼습니다.'; $lang->ncenterlite_content_image = '(이미지)'; $lang->ncenterlite_content_empty = '(내용 없음)'; $lang->ncenterlite_ago = '전'; diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 13a706035..c38056768 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -31,6 +31,8 @@ class ncenterliteAdminController extends ncenterlite 'variable_name', 'user_notify_setting', 'anonymous_voter', + 'comment_all', + 'comment_all_notify_module_srls', ); foreach($config_vars as $val) @@ -77,6 +79,19 @@ class ncenterliteAdminController extends ncenterlite $config->admin_notify_module_srls = array(); } } + + if($obj->disp_act == 'dispNcenterliteAdminOtherComment') + { + if(!$obj->comment_all) + { + $config->comment_all = 'N'; + } + if(!$obj->comment_all_notify_module_srls) + { + $config->comment_all_notify_module_srls = array(); + } + } + $output = $oModuleController->insertModuleConfig('ncenterlite', $config); if(!$output->toBool()) { diff --git a/modules/ncenterlite/ncenterlite.admin.view.php b/modules/ncenterlite/ncenterlite.admin.view.php index b601d2eae..3f159e6cb 100644 --- a/modules/ncenterlite/ncenterlite.admin.view.php +++ b/modules/ncenterlite/ncenterlite.admin.view.php @@ -41,6 +41,18 @@ class ncenterliteAdminView extends ncenterlite Context::set('mid_list', $mid_list); Context::set('config', $config); } + + function dispNcenterliteAdminOtherComment() + { + $oModuleModel = getModel('module'); + $oNcenterliteModel = getModel('ncenterlite'); + $config = $oNcenterliteModel->getConfig(); + + $mid_list = $oModuleModel->getMidList(null, array('module_srl', 'mid', 'browser_title', 'module')); + + Context::set('mid_list', $mid_list); + Context::set('config', $config); + } function dispNcenterliteAdminSkinsetting() { diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index c0b04c5ea..fef6b5751 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -175,7 +175,7 @@ class ncenterliteController extends ncenterlite $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl); - if(isset($config->use['comment_all']) && $obj->member_srl == $oDocument->get('member_srl') && !$obj->parent_srl) + if($config->comment_all == 'Y' && $obj->member_srl == $oDocument->get('member_srl') && !$obj->parent_srl && (is_array($config->comment_all_notify_module_srls) && in_array($module_info->module_srl, $config->comment_all_notify_module_srls))) { $comment_args = new stdClass(); $comment_args->member_srl = $obj->member_srl; diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 46dfdcb6b..df3c06fc6 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -569,7 +569,7 @@ class ncenterliteModel extends ncenterlite break; case 'G': - $str = sprintf(lang('ncenterlite_insert_comment_all_message'), $notification->target_nick_name, $notification->target_summary); + $str = sprintf(lang('ncenterlite_commented'), $notification->target_nick_name, $type, $notification->target_summary); break; // Other. diff --git a/modules/ncenterlite/tpl/config.html b/modules/ncenterlite/tpl/config.html index 69a88feb5..1595f1d7c 100644 --- a/modules/ncenterlite/tpl/config.html +++ b/modules/ncenterlite/tpl/config.html @@ -30,13 +30,6 @@ - -
- - - - -
diff --git a/modules/ncenterlite/tpl/header.html b/modules/ncenterlite/tpl/header.html index ec62d3f05..a560c0a3e 100644 --- a/modules/ncenterlite/tpl/header.html +++ b/modules/ncenterlite/tpl/header.html @@ -6,6 +6,7 @@