diff --git a/modules/ncenterlite/conf/module.xml b/modules/ncenterlite/conf/module.xml index 8df48061e..b229b4a85 100644 --- a/modules/ncenterlite/conf/module.xml +++ b/modules/ncenterlite/conf/module.xml @@ -7,6 +7,7 @@ + diff --git a/modules/ncenterlite/lang/en.php b/modules/ncenterlite/lang/en.php index a05dba585..7a95b8758 100644 --- a/modules/ncenterlite/lang/en.php +++ b/modules/ncenterlite/lang/en.php @@ -1,6 +1,7 @@ ncenterlite = 'Notification Center Lite'; $lang->ncenterlite_install_version = 'Installed version'; +$lang->ncenterlite_advenced_config = 'Advenced Setting'; $lang->ncenterlite_document = 'document'; $lang->ncenterlite_comment = 'comment'; $lang->ncenterlite_type_message = 'message'; @@ -26,14 +27,15 @@ $lang->ncenterlite_activate = 'Activate'; $lang->ncenterlite_inactivate = 'Inactivate'; $lang->ncenterlite_userconfig_about_warning = 'Watch out! You are controlling other user\'s settings via this page.'; $lang->ncenterlite_article = '%1$s wrote an article as "%2$s".'; -$lang->ncenterlite_board = '%1$s wrote an article as "%3$s" on the board %2$s.'; +$lang->ncenterlite_board = '%1$s wrote "%3$s" on %2$s.'; $lang->ncenterlite_commented = '%1$s commented as "%3$s" on your %2$s.'; $lang->ncenterlite_commented_board = '%1$s commented as "%3$s" on the board %2$s.'; -$lang->ncenterlite_mentioned = '%s mentioned you on "%s" %s.'; +$lang->ncenterlite_mentioned = '%s mentioned you on "%s"board to "%s" .'; $lang->ncenterlite_message_string = 'You have %d new message(s).'; $lang->ncenterlite_message_mention = '%1$s sent a message as "%2$s".'; $lang->ncenterlite_test_noti = '%s! Skin test notification has been done.'; $lang->ncenterlite_vote = '%1$s marked the article "%2$s" with a recommendation.'; +$lang->ncenterlite_admin_content_message = '%1$s wrote "%3$s" on %2$s.'; $lang->ncenterlite_ago = 'ago'; $lang->ncenterlite_date['0'] = 'Year'; $lang->ncenterlite_date['1'] = 'Month'; diff --git a/modules/ncenterlite/lang/ko.php b/modules/ncenterlite/lang/ko.php index 517776007..6cbb8ec20 100644 --- a/modules/ncenterlite/lang/ko.php +++ b/modules/ncenterlite/lang/ko.php @@ -1,6 +1,7 @@ ncenterlite = '알림센터 Lite'; $lang->ncenterlite_install_version = '설치된 버전'; +$lang->ncenterlite_advenced_config = '고급설정'; $lang->ncenterlite_document = '글'; $lang->ncenterlite_comment = '댓글'; $lang->ncenterlite_mention = '멘션'; @@ -38,7 +39,7 @@ $lang->ncenterlite_article = '%1$s님이 "%2$s"ncenterlite_board = '%1$s님이 게시판 "%2$s"에 "%3$s"라고 글을 남겼습니다.'; $lang->ncenterlite_commented = '%1$s님이 회원님의 %2$s에 "%3$s"라고 댓글을 남겼습니다.'; $lang->ncenterlite_commented_board = '%1$s님이 "%2$s"게시판에 "%3$s"라고 댓글을 남겼습니다.'; -$lang->ncenterlite_mentioned = '%s님이 "%s" %s에서 회원님을 언급하였습니다.'; +$lang->ncenterlite_mentioned = '%s님이 "%s"게시판에서 "%s" 게시글을 작성하며 회원님을 언급하였습니다.'; $lang->ncenterlite_message_string = '%d개의 읽지 않은 메시지가 있습니다.'; $lang->ncenterlite_message_mention = '%s님께서 "%s"라고 메시지를 보내셨습니다.'; $lang->ncenterlite_test_noti = '%s님! 스킨 테스트 알림을 완료했습니다.'; diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 15662c59b..2d56d7e07 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -14,7 +14,6 @@ class ncenterliteAdminController extends ncenterlite 'mention_names', 'mention_suffixes', 'mention_suffix_always_cut', - 'document_notify', 'hide_module_srls', 'admin_notify_module_srls', 'skin', @@ -26,7 +25,6 @@ class ncenterliteAdminController extends ncenterlite 'document_read', 'layout_srl', 'mlayout_srl', - 'document_notify' ); foreach($config_vars as $val) diff --git a/modules/ncenterlite/ncenterlite.admin.view.php b/modules/ncenterlite/ncenterlite.admin.view.php index 7be649aec..c7ccbd86a 100644 --- a/modules/ncenterlite/ncenterlite.admin.view.php +++ b/modules/ncenterlite/ncenterlite.admin.view.php @@ -60,6 +60,14 @@ class ncenterliteAdminView extends ncenterlite $security->encodeHTML('colorset_list..name','colorset_list..title'); } + function dispNcenterliteAdminAdvancedconfig() + { + $oNcenterliteModel = getModel('ncenterlite'); + + $config = $oNcenterliteModel->getConfig(); + Context::set('config', $config); + } + function dispNcenterliteAdminList() { $oNcenterliteAdminModel = getAdminModel('ncenterlite'); diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 21aa7f76f..059a78079 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -88,48 +88,14 @@ class ncenterliteController extends ncenterlite $logged_info = Context::get('logged_info'); $admin_list = $oNcenterliteModel->getMemberAdmins(); - $admin_document_notify = false; - if(isset($config->use['admin_content']) && is_array($config->admin_notify_module_srls) && in_array($module_info->module_srl, $config->admin_notify_module_srls)) - { - foreach($admin_list as $admins) - { - if($logged_info->member_srl == $admins) - { - continue; - } - - $args = new stdClass(); - $args->member_srl = $admins->member_srl; - $args->srl = $obj->document_srl; - $args->target_p_srl = $obj->document_srl; - $args->target_srl = $obj->document_srl; - $args->type = $this->_TYPE_DOCUMENT; - $args->target_type = $this->_TYPE_ADMIN_DOCUMENT; - $args->target_url = getNotEncodedFullUrl('', 'document_srl', $obj->document_srl); - $args->target_summary = cut_str(strip_tags($obj->title), 50); - $args->regdate = date('YmdHis'); - $args->target_browser = $module_info->browser_title; - $args->notify = $this->_getNotifyId($args); - $output = $this->_insertNotify($args, $is_anonymous); - if(!$output->toBool()) - { - return $output; - } - else - { - $admin_document_notify = true; - } - } - } - - if(!$mention_targets || !count($mention_targets) || !isset($config->use['mention'])) - { - return new Object(); - } - // 맨션 알림일경우 맨션알림 시작. - if($mention_targets) + if(!empty($mention_targets)) { + if(!$mention_targets && !count($mention_targets) || !isset($config->use['mention'])) + { + return new Object(); + } + // !TODO 공용 메소드로 분리 foreach($mention_targets as $mention_member_srl) { @@ -141,11 +107,6 @@ class ncenterliteController extends ncenterlite continue; } - if(is_array($admin_list) && in_array($mention_member_srl, $admin_list) && isset($config->use['admin_content']) && $admin_document_notify == true) - { - continue; - } - $args = new stdClass(); $args->member_srl = $mention_member_srl; $args->srl = $obj->document_srl; @@ -168,6 +129,35 @@ class ncenterliteController extends ncenterlite } } + if(isset($config->use['admin_content']) && is_array($config->admin_notify_module_srls) && in_array($module_info->module_srl, $config->admin_notify_module_srls) && empty($mention_targets)) + { + foreach($admin_list as $admins) + { + if($logged_info->member_srl == $admins) + { + continue; + } + + $args = new stdClass(); + $args->member_srl = $admins; + $args->srl = $obj->document_srl; + $args->target_p_srl = $obj->document_srl; + $args->target_srl = $obj->document_srl; + $args->type = $this->_TYPE_DOCUMENT; + $args->target_type = $this->_TYPE_ADMIN_DOCUMENT; + $args->target_url = getNotEncodedFullUrl('', 'document_srl', $obj->document_srl); + $args->target_summary = cut_str(strip_tags($obj->title), 50); + $args->regdate = date('YmdHis'); + $args->target_browser = $module_info->browser_title; + $args->notify = $this->_getNotifyId($args); + $output = $this->_insertNotify($args, $is_anonymous); + if(!$output->toBool()) + { + return $output; + } + } + } + return new Object(); } @@ -232,8 +222,7 @@ class ncenterliteController extends ncenterlite if(isset($config->use['mention'])) { $mention_targets = $this->_getMentionTarget($content); - debugPrint($mention_targets); - + // !TODO 공용 메소드로 분리 foreach($mention_targets as $mention_member_srl) { diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index ddc2e2f12..ca23c2b1f 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -28,11 +28,9 @@ class ncenterliteModel extends ncenterlite $config->mention_suffixes = array('님', '様', 'さん', 'ちゃん'); } unset($config->mention_format); - if(!$config->document_notify) $config->document_notify = 'direct-comment'; if(!$config->hide_module_srls) $config->hide_module_srls = array(); if(!is_array($config->hide_module_srls)) $config->hide_module_srls = explode('|@|', $config->hide_module_srls); - if(!$config->document_read) $config->document_read = 'N'; - if(!$config->voted_format) $config->voted_format = 'N'; + if(!$config->document_read) $config->document_read = 'Y'; if(!$config->skin) $config->skin = 'default'; if(!$config->colorset) $config->colorset = 'black'; if(!$config->zindex) $config->zindex = '9999'; @@ -168,7 +166,7 @@ class ncenterliteModel extends ncenterlite //$str = sprintf('%1$s님이 게시판 "%2$s"에 "%3$s"라고 댓글을 남겼습니다.', $target_member, $type, $v->target_summary); break; case 'M': - $str = sprintf($lang->ncenterlite_mentioned, $target_member, $v->target_summary, $type); + $str = sprintf($lang->ncenterlite_mentioned, $target_member, $v->target_browser, $v->target_summary); //$str = sprintf('%s님이 "%s" %s에서 회원님을 언급하였습니다.', $target_member, $v->target_summary, $type); break; // 메시지. 쪽지 diff --git a/modules/ncenterlite/ruleset/insertConfig.xml b/modules/ncenterlite/ruleset/insertConfig.xml index 56d9133b7..7fb06a60c 100644 --- a/modules/ncenterlite/ruleset/insertConfig.xml +++ b/modules/ncenterlite/ruleset/insertConfig.xml @@ -7,7 +7,6 @@ - diff --git a/modules/ncenterlite/tpl/advancedconfig.html b/modules/ncenterlite/tpl/advancedconfig.html new file mode 100644 index 000000000..a6fe098bc --- /dev/null +++ b/modules/ncenterlite/tpl/advancedconfig.html @@ -0,0 +1,56 @@ + + +
+ + + + +
+
+ +
+ + +

{$lang->ncenterlite_mention_target_about}

+
+
+
+ +
+ +

{$lang->about_mention_suffixes}

+
+
+
+ +
+ + +

{$lang->about_mention_suffix_always_cut}

+
+
+ +
+ +
+ +

{$lang->about_anonymous_nick_name}

+
+
+
+
+
+ +
+
+
diff --git a/modules/ncenterlite/tpl/config.html b/modules/ncenterlite/tpl/config.html index fb3adcbb0..5c94e040f 100644 --- a/modules/ncenterlite/tpl/config.html +++ b/modules/ncenterlite/tpl/config.html @@ -44,39 +44,6 @@

{$lang->about_member_menu_view}

-
- -
- - -

{$lang->ncenterlite_mention_target_about}

-
-
-
- -
- -

{$lang->about_mention_suffixes}

-
-
-
- -
- - -

{$lang->about_mention_suffix_always_cut}

-
-
@@ -85,13 +52,6 @@

{$lang->ncenterlite_document_event_read_about}

-
- -
- -

{$lang->about_anonymous_nick_name}

-
-
diff --git a/modules/ncenterlite/tpl/header.html b/modules/ncenterlite/tpl/header.html index 4177e3517..8a8425cfc 100644 --- a/modules/ncenterlite/tpl/header.html +++ b/modules/ncenterlite/tpl/header.html @@ -5,6 +5,7 @@