From 696ca5a6bf795eb56cc735439958909d00a66810 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Wed, 5 Feb 2020 15:47:59 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=96=B4=EB=A5=BC=20=EB=B2=94?= =?UTF-8?q?=EC=9A=A9=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=B0=94=EA=BE=B8?= =?UTF-8?q?=EA=B3=A0=20=ED=9A=8C=EC=9B=90=20=EB=A9=94=EB=89=B4=EC=97=90=20?= =?UTF-8?q?=EC=B0=A8=EB=8B=A8=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/conf/module.xml | 6 +-- modules/ncenterlite/lang/ko.php | 13 +++--- .../ncenterlite.admin.controller.php | 2 +- .../ncenterlite/ncenterlite.controller.php | 41 +++++++++++-------- modules/ncenterlite/ncenterlite.model.php | 10 ++--- modules/ncenterlite/ncenterlite.view.php | 36 ++++++++-------- .../queries/deleteIndividualBlock.xml | 8 ---- .../ncenterlite/queries/deleteUnsubscribe.xml | 8 ++++ ...alBlockList.xml => getUnsubscribeList.xml} | 6 +-- ...erIndividualBlockConfigByIndividualSrl.xml | 13 ------ ...> getUserUnsubscribeConfigByTargetSrl.xml} | 4 +- ...tUserUnsubscribeConfigByUnsubscribeSrl.xml | 13 ++++++ ...ividualBlock.xml => insertUnsubscribe.xml} | 8 ++-- ...vidual.xml => ncenterlite_unsubscribe.xml} | 6 +-- ...{individualBlock.html => unsubscribe.html} | 32 +++++++-------- ...dividualList.html => unsubscribeList.html} | 24 ++++++----- modules/ncenterlite/tpl/advancedconfig.html | 8 ++-- 17 files changed, 124 insertions(+), 114 deletions(-) delete mode 100644 modules/ncenterlite/queries/deleteIndividualBlock.xml create mode 100644 modules/ncenterlite/queries/deleteUnsubscribe.xml rename modules/ncenterlite/queries/{getIndividualBlockList.xml => getUnsubscribeList.xml} (68%) delete mode 100644 modules/ncenterlite/queries/getUserIndividualBlockConfigByIndividualSrl.xml rename modules/ncenterlite/queries/{getUserIndividualBlockConfigByTargetSrl.xml => getUserUnsubscribeConfigByTargetSrl.xml} (73%) create mode 100644 modules/ncenterlite/queries/getUserUnsubscribeConfigByUnsubscribeSrl.xml rename modules/ncenterlite/queries/{insertIndividualBlock.xml => insertUnsubscribe.xml} (50%) rename modules/ncenterlite/schemas/{ncenterlite_block_individual.xml => ncenterlite_unsubscribe.xml} (50%) rename modules/ncenterlite/skins/default/{individualBlock.html => unsubscribe.html} (60%) rename modules/ncenterlite/skins/default/{individualList.html => unsubscribeList.html} (63%) diff --git a/modules/ncenterlite/conf/module.xml b/modules/ncenterlite/conf/module.xml index 03a8fa76c..21e905d15 100644 --- a/modules/ncenterlite/conf/module.xml +++ b/modules/ncenterlite/conf/module.xml @@ -4,8 +4,8 @@ - - + + @@ -13,7 +13,7 @@ - + diff --git a/modules/ncenterlite/lang/ko.php b/modules/ncenterlite/lang/ko.php index 0ee625447..8c5377215 100644 --- a/modules/ncenterlite/lang/ko.php +++ b/modules/ncenterlite/lang/ko.php @@ -126,10 +126,13 @@ $lang->ncenterlite_commnet_event_noti_some = '대댓글은 알리지 않음'; $lang->ncenterlite_message_event = '쪽지 알림 설정'; $lang->ncenterlite_message_event_about = '쪽지 알림을 사용하지 않음(XE의 기본 쪽지 알림을 사용)'; $lang->ncenterlite_mid_use = '모듈별 사용 설정'; -$lang->ncenterlite_to_block = '차단함'; -$lang->ncenterlite_unblock = '차단 안함'; -$lang->this_message_block = '이 게시글/댓글의 알림 차단여부'; -$lang->about_this_message_block = '이 게시글/댓글의 알림을 차단합니다.'; +$lang->ncenterlite_to_unsubscribe = '수신 거부'; +$lang->ncenterlite_subscribe = '수신 거부 안함'; +$lang->this_message_unsubscribe = '이 게시글/댓글의 알림 수신 거부'; +$lang->about_this_message_unsubscribe = '이 게시글/댓글의 알림을 수신 거부합니다.'; +$lang->unsubscribe_list = '수신 거부 리스트'; +$lang->unsubscribe = '개별 문서/댓글 알림 수신 거부'; +$lang->about_unsubscribe = '개별 문서/댓글 알림 수신을 거부하는 기능을 사용합니다.'; $lang->member_menu_view = '회원 메뉴 표시'; $lang->member_menu_on = '표시'; $lang->member_menu_off = '표시하지 않음'; @@ -175,4 +178,4 @@ $lang->ncenterlite_custom_list = '커스텀 리스트'; $lang->msg_not_use_user_setting = '유저 세팅을 제공하지 않습니다. 관리자에게 문의하세요.'; $lang->msg_denger_rhymix_user = '경고! 라이믹스에서는 코어에 포함된 순정 알림센터를 사용해야 합니다.
XE용 알림센터를 삭제하고, 라이믹스 알림센터를 다시 설치해 주시기 바랍니다.'; $lang->msg_test_notifycation_success = '테스트알림더미를 정상적으로 생성하였습니다.'; -$lang->msg_individual_block_not_support = '개별 차단 기능을 제공하지 않습니다. 관리자에게 문의하세요.'; +$lang->msg_unsubscribe_block_not_support = '개별 수신 거부 기능을 제공하지 않습니다. 관리자에게 문의하세요.'; diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 6fae888bb..d4009bc95 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -35,7 +35,7 @@ class ncenterliteAdminController extends ncenterlite 'highlight_effect', 'comment_all', 'comment_all_notify_module_srls', - 'individual_block', + 'unsubscribe', ); foreach($config_vars as $val) diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index eb1fa8c64..bcc2f7efc 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -66,14 +66,15 @@ class ncenterliteController extends ncenterlite } } - function procNcenterliteInsertIndividualBlock() + function procNcenterliteInsertUnsubscribe() { + /** @var ncenterliteModel $oNcenterliteModel */ $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->individual_block !== 'Y') + if($config->unsubscribe !== 'Y') { - throw new Rhymix\Framework\Exception('msg_individual_block_not_support'); + throw new Rhymix\Framework\Exception('msg_unsubscribe_block_not_support'); } $member_srl = Context::get('member_srl'); @@ -88,16 +89,16 @@ class ncenterliteController extends ncenterlite } $obj = Context::getRequestVars(); - if($obj->individual_srl) + if($obj->unsubscribe_srl) { - $userBlockData = $oNcenterliteModel->getUserIndividualBlockConfigByIndividualSrl($obj->individual_srl); + $userBlockData = $oNcenterliteModel->getUserUnsubscribeConfigByUnsubscribeSrl($obj->unsubscribe_srl); } else if($obj->target_srl) { - $userBlockData = $oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($obj->target_srl, $member_srl); + $userBlockData = $oNcenterliteModel->getUserUnsubscribeConfigByTargetSrl($obj->target_srl, $member_srl); } - if($obj->individual_type == 'document') + if($obj->unsubscribe_type == 'document') { $text = cut_str(getModel('document')->getDocument($obj->target_srl)->get('title'), 30); } @@ -110,7 +111,7 @@ class ncenterliteController extends ncenterlite $args = new stdClass(); $args->member_srl = $member_srl; $args->target_srl = $obj->target_srl; - if($obj->individual_type == 'document') + if($obj->unsubscribe_type == 'document') { $args->document_srl = $obj->target_srl; } @@ -118,7 +119,7 @@ class ncenterliteController extends ncenterlite { $args->document_srl = $comment->get('document_srl'); } - $args->individual_type = $obj->individual_type; + $args->unsubscribe_type = $obj->unsubscribe_type; $args->text = $text; if($obj->value == 'Y') @@ -126,8 +127,8 @@ class ncenterliteController extends ncenterlite // 데이터가 있으면 차단, 데이터가 없으면 차단하지 않기 때문에 따로 업데이트를 하지 않는다. if(!$userBlockData) { - $args->individual_srl = getNextSequence(); - $output = executeQuery('ncenterlite.insertIndividualBlock', $args); + $args->unsubscribe_srl = getNextSequence(); + $output = executeQuery('ncenterlite.insertUnsubscribe', $args); if(!$output->toBool()) { return $output; @@ -135,13 +136,13 @@ class ncenterliteController extends ncenterlite } else { - $args->individual_srl = $userBlockData->individual_srl; + $args->unsubscribe_srl = $userBlockData->unsubscribe_srl; } } else { - $args->individual_srl = $obj->individual_srl; - $output = executeQuery('ncenterlite.deleteIndividualBlock', $args); + $args->unsubscribe_srl = $obj->unsubscribe_srl; + $output = executeQuery('ncenterlite.deleteUnsubscribe', $args); if(!$output->toBool()) { return $output; @@ -155,7 +156,7 @@ class ncenterliteController extends ncenterlite } else { - $this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteIndividualBlockList', 'member_srl', $member_srl)); + $this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'member_srl', $member_srl)); } } @@ -393,12 +394,12 @@ class ncenterliteController extends ncenterlite } // 받는 사람이 문서를 차단하고 있을 경우 - if($oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($document_srl, $abs_member_srl)) + if($oNcenterliteModel->getUserUnsubscribeConfigByTargetSrl($document_srl, $abs_member_srl)) { return; } - if($oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($parent_srl, $abs_member_srl)) + if($oNcenterliteModel->getUserUnsubscribeConfigByTargetSrl($parent_srl, $abs_member_srl)) { return; } @@ -436,7 +437,7 @@ class ncenterliteController extends ncenterlite return; } - if($oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($document_srl, $abs_member_srl)) + if($oNcenterliteModel->getUserUnsubscribeConfigByTargetSrl($document_srl, $abs_member_srl)) { return; } @@ -1031,6 +1032,10 @@ class ncenterliteController extends ncenterlite $target_srl = Context::get('target_srl'); $oMemberController->addMemberMenu('dispNcenterliteNotifyList', 'ncenterlite_my_list'); + if($config->unsubscribe == 'Y') + { + $oMemberController->addMemberMenu('dispNcenterliteUnsubscribeList', 'unsubscribe_list'); + } } if($config->user_notify_setting == 'Y') diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 43b189186..575f82829 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -670,16 +670,16 @@ class ncenterliteModel extends ncenterlite return $output->data; } - function getUserIndividualBlockConfigByIndividualSrl($individual_srl = 0) + function getUserUnsubscribeConfigByUnsubscribeSrl($unsubscribe_srl = 0) { $args = new stdClass(); - $args->individual_srl = $individual_srl; - $output = executeQuery('ncenterlite.getUserIndividualBlockConfigByIndividualSrl', $args); + $args->unsubscribe_srl = $unsubscribe_srl; + $output = executeQuery('ncenterlite.getUserUnsubscribeConfigByUnsubscribeSrl', $args); return $output->data; } - function getUserIndividualBlockConfigByTargetSrl($target_srl = 0, $member_srl = null) + function getUserUnsubscribeConfigByTargetSrl($target_srl = 0, $member_srl = null) { if(!$member_srl) { @@ -689,7 +689,7 @@ class ncenterliteModel extends ncenterlite $args = new stdClass(); $args->target_srl = $target_srl; $args->member_srl = $member_srl; - $output = executeQuery('ncenterlite.getUserIndividualBlockConfigByTargetSrl', $args); + $output = executeQuery('ncenterlite.getUserUnsubscribeConfigByTargetSrl', $args); return $output->data; } diff --git a/modules/ncenterlite/ncenterlite.view.php b/modules/ncenterlite/ncenterlite.view.php index e26f1fd59..a7ec81dbe 100644 --- a/modules/ncenterlite/ncenterlite.view.php +++ b/modules/ncenterlite/ncenterlite.view.php @@ -72,15 +72,15 @@ class ncenterliteView extends ncenterlite $this->setTemplateFile('userconfig'); } - function dispNcenterliteIndividualBlockList() + function dispNcenterliteUnsubscribeList() { /** @var ncenterliteModel $oNcenterliteModel */ $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->individual_block !== 'Y') + if($config->unsubscribe !== 'Y') { - throw new Rhymix\Framework\Exception('msg_individual_block_not_support'); + throw new Rhymix\Framework\Exception('msg_unsubscribe_block_not_support'); } if(!Rhymix\Framework\Session::getMemberSrl()) @@ -100,43 +100,43 @@ class ncenterliteView extends ncenterlite $args->list_count = '20'; $args->page_count = '10'; $args->member_srl = $member_srl; - $output = executeQuery('ncenterlite.getIndividualBlockList', $args); + $output = executeQuery('ncenterlite.getUnsubscribeList', $args); Context::set('total_count', $output->page_navigation->total_count); Context::set('total_page', $output->page_navigation->total_page); Context::set('page', $output->page); - Context::set('individual_list', $output->data); + Context::set('unsubscribe_list', $output->data); Context::set('page_navigation', $output->page_navigation); - $this->setTemplateFile('individualList'); + $this->setTemplateFile('unsubscribeList'); } - function dispNcenterliteInsertIndividualBlock() + function dispNcenterliteInsertUnsubscribe() { /** @var ncenterliteModel $oNcenterliteModel */ $oNcenterliteModel = getModel('ncenterlite'); $target_srl = Context::get('target_srl'); - $individual_srl = Context::get('individual_srl'); - $individual_type = Context::get('individual_type'); + $unsubscribe_srl = Context::get('unsubscribe_srl'); + $unsubscribe_type = Context::get('unsubscribe_type'); $member_srl = Context::get('member_srl'); - if($individual_srl) + if($unsubscribe_srl) { - $output = $oNcenterliteModel->getUserIndividualBlockConfigByIndividualSrl($individual_srl); + $output = $oNcenterliteModel->getUserUnsubscribeConfigByUnsubscribeSrl($unsubscribe_srl); } else { - $output = $oNcenterliteModel->getUserIndividualBlockConfigByTargetSrl($target_srl, $member_srl); + $output = $oNcenterliteModel->getUserUnsubscribeConfigByTargetSrl($target_srl, $member_srl); } - if((!$target_srl || !$individual_type) && !$output) + if((!$target_srl || !$unsubscribe_type) && !$output) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - if($individual_type == 'document') + if($unsubscribe_type == 'document') { $text = getModel('document')->getDocument($target_srl)->get('title'); $type = '문서'; @@ -149,7 +149,7 @@ class ncenterliteView extends ncenterlite } else { - Context::set('individual_type', 'comment'); + Context::set('unsubscribe_type', 'comment'); $type = '댓글'; } } @@ -168,16 +168,16 @@ class ncenterliteView extends ncenterlite } else { - Context::set('individual_type', 'document'); + Context::set('unsubscribe_type', 'document'); $type = '문서'; } } } - Context::set('individualData', $output); + Context::set('unsubscribeData', $output); Context::set('text', $text); Context::set('type', $type); - $this->setTemplateFile('individualBlock'); + $this->setTemplateFile('unsubscribe'); } } diff --git a/modules/ncenterlite/queries/deleteIndividualBlock.xml b/modules/ncenterlite/queries/deleteIndividualBlock.xml deleted file mode 100644 index 987c634a3..000000000 --- a/modules/ncenterlite/queries/deleteIndividualBlock.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/modules/ncenterlite/queries/deleteUnsubscribe.xml b/modules/ncenterlite/queries/deleteUnsubscribe.xml new file mode 100644 index 000000000..ba81e49fa --- /dev/null +++ b/modules/ncenterlite/queries/deleteUnsubscribe.xml @@ -0,0 +1,8 @@ + + +
+ + + + + diff --git a/modules/ncenterlite/queries/getIndividualBlockList.xml b/modules/ncenterlite/queries/getUnsubscribeList.xml similarity index 68% rename from modules/ncenterlite/queries/getIndividualBlockList.xml rename to modules/ncenterlite/queries/getUnsubscribeList.xml index fb44569cb..0d8d03858 100644 --- a/modules/ncenterlite/queries/getIndividualBlockList.xml +++ b/modules/ncenterlite/queries/getUnsubscribeList.xml @@ -1,6 +1,6 @@ - + -
+
@@ -11,7 +11,7 @@ - + diff --git a/modules/ncenterlite/queries/getUserIndividualBlockConfigByIndividualSrl.xml b/modules/ncenterlite/queries/getUserIndividualBlockConfigByIndividualSrl.xml deleted file mode 100644 index 7b2fb624f..000000000 --- a/modules/ncenterlite/queries/getUserIndividualBlockConfigByIndividualSrl.xml +++ /dev/null @@ -1,13 +0,0 @@ - - -
- - - - - - - - - - diff --git a/modules/ncenterlite/queries/getUserIndividualBlockConfigByTargetSrl.xml b/modules/ncenterlite/queries/getUserUnsubscribeConfigByTargetSrl.xml similarity index 73% rename from modules/ncenterlite/queries/getUserIndividualBlockConfigByTargetSrl.xml rename to modules/ncenterlite/queries/getUserUnsubscribeConfigByTargetSrl.xml index d2246f10f..b5c5d4deb 100644 --- a/modules/ncenterlite/queries/getUserIndividualBlockConfigByTargetSrl.xml +++ b/modules/ncenterlite/queries/getUserUnsubscribeConfigByTargetSrl.xml @@ -1,6 +1,6 @@ - + -
+
diff --git a/modules/ncenterlite/queries/getUserUnsubscribeConfigByUnsubscribeSrl.xml b/modules/ncenterlite/queries/getUserUnsubscribeConfigByUnsubscribeSrl.xml new file mode 100644 index 000000000..480ee2efb --- /dev/null +++ b/modules/ncenterlite/queries/getUserUnsubscribeConfigByUnsubscribeSrl.xml @@ -0,0 +1,13 @@ + + +
+ + + + + + + + + + diff --git a/modules/ncenterlite/queries/insertIndividualBlock.xml b/modules/ncenterlite/queries/insertUnsubscribe.xml similarity index 50% rename from modules/ncenterlite/queries/insertIndividualBlock.xml rename to modules/ncenterlite/queries/insertUnsubscribe.xml index 07d9d8d06..8d93c9c59 100644 --- a/modules/ncenterlite/queries/insertIndividualBlock.xml +++ b/modules/ncenterlite/queries/insertUnsubscribe.xml @@ -1,12 +1,12 @@ - + -
+
- + - + diff --git a/modules/ncenterlite/schemas/ncenterlite_block_individual.xml b/modules/ncenterlite/schemas/ncenterlite_unsubscribe.xml similarity index 50% rename from modules/ncenterlite/schemas/ncenterlite_block_individual.xml rename to modules/ncenterlite/schemas/ncenterlite_unsubscribe.xml index 08352ea99..fe1808c51 100644 --- a/modules/ncenterlite/schemas/ncenterlite_block_individual.xml +++ b/modules/ncenterlite/schemas/ncenterlite_unsubscribe.xml @@ -1,7 +1,7 @@ -
- +
+ - +
diff --git a/modules/ncenterlite/skins/default/individualBlock.html b/modules/ncenterlite/skins/default/unsubscribe.html similarity index 60% rename from modules/ncenterlite/skins/default/individualBlock.html rename to modules/ncenterlite/skins/default/unsubscribe.html index 50287c027..231162249 100644 --- a/modules/ncenterlite/skins/default/individualBlock.html +++ b/modules/ncenterlite/skins/default/unsubscribe.html @@ -2,23 +2,21 @@
-
+

{$XE_VALIDATOR_MESSAGE}

- -
- - - - - - + + + + + + - - + +
@@ -33,8 +31,8 @@

- - {$individualData->text} + + {$unsubscribeData->text} {$text} @@ -43,15 +41,15 @@

- +
-

{$lang->about_this_message_block}

+

{$lang->about_this_message_unsubscribe}

diff --git a/modules/ncenterlite/skins/default/individualList.html b/modules/ncenterlite/skins/default/unsubscribeList.html similarity index 63% rename from modules/ncenterlite/skins/default/individualList.html rename to modules/ncenterlite/skins/default/unsubscribeList.html index 127af4d82..0949d7fe4 100644 --- a/modules/ncenterlite/skins/default/individualList.html +++ b/modules/ncenterlite/skins/default/unsubscribeList.html @@ -1,4 +1,7 @@ +
+

{$XE_VALIDATOR_MESSAGE}

+
@@ -8,18 +11,18 @@ - +
- + 문서 댓글 - - {$val->text} + + {$val->text} {$val->text} @@ -28,13 +31,14 @@
- + + - - - + +
diff --git a/modules/ncenterlite/tpl/advancedconfig.html b/modules/ncenterlite/tpl/advancedconfig.html index ac3d70860..ed27eb69d 100644 --- a/modules/ncenterlite/tpl/advancedconfig.html +++ b/modules/ncenterlite/tpl/advancedconfig.html @@ -95,15 +95,15 @@
- +
-

{$lang->about_highlight_effect}

+

{$lang->about_unsubscribe}