From 06ac1cd6d516e730f40f573b3a98bcd081e21952 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sat, 10 Apr 2021 02:23:11 +0900 Subject: [PATCH 1/7] unset to private member info when load to getMyNotifyListTpl --- modules/ncenterlite/ncenterlite.model.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 1e5c2edd0..fd29b7a82 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -315,6 +315,9 @@ class ncenterliteModel extends ncenterlite $tmp = $this->getMyNotifyList($member_srl, $page); foreach($tmp->data as $key => $obj) { + unset($tmp->data[$key]->target_email_address); + unset($tmp->data[$key]->target_user_id); + unset($tmp->data[$key]->target_member_srl); $tmp->data[$key]->url = str_replace('&', '&', $obj->url); } From d8eba515b67baeed3953dd95909dcafb8b5fa96a Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sat, 10 Apr 2021 02:43:14 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Fix=20#1685=20=EC=8A=A4=ED=81=AC=EB=9E=A9?= =?UTF-8?q?=20=EC=9D=B5=EB=AA=85=20=EA=B8=B0=EB=8A=A5=EC=9D=B4=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index fd29b7a82..729bab8b4 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -282,13 +282,13 @@ class ncenterliteModel extends ncenterlite $v->text = $this->getNotificationText($v); $v->ago = $this->getAgo($v->regdate); $v->url = getUrl('','act','procNcenterliteRedirect', 'notify', $v->notify); - if($v->target_type === $this->_TYPE_VOTED && $config->anonymous_voter === 'Y') + if(($v->target_type === $this->_TYPE_VOTED && $config->anonymous_voter === 'Y') || ($v->target_type === $this->_TYPE_SCRAPPED && $config->anonymous_scrap === 'Y')) { $v->target_member_srl = $member_srl; $v->target_nick_name = lang('anonymous'); $v->target_user_id = $v->target_email_address = 'anonymous'; } - if($v->target_member_srl) + if($v->target_member_srl && ($v->target_type !== $this->_TYPE_VOTED || $v->target_type !== $this->_TYPE_SCRAPPED)) { $profileImage = $oMemberModel->getProfileImage($v->target_member_srl); $v->profileImage = $profileImage->src; From 87d725b8be856d6f3b4870b1ed02b61b1ac9dcc6 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sat, 10 Apr 2021 18:06:52 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EA=B5=AC=EB=8F=85=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=9C=B0=20=EA=B2=BD=EC=9A=B0=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.view.php | 2 + .../skins/default/unsubscribe.html | 72 +++++++++---------- .../skins/default_bottom/unsubscribe.html | 68 +++++++++--------- 3 files changed, 70 insertions(+), 72 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.view.php b/modules/ncenterlite/ncenterlite.view.php index 47c701bf1..01fbef50a 100644 --- a/modules/ncenterlite/ncenterlite.view.php +++ b/modules/ncenterlite/ncenterlite.view.php @@ -143,6 +143,8 @@ class ncenterliteView extends ncenterlite function dispNcenterliteInsertUnsubscribe() { + $this->setLayoutFile('popup_layout'); + /** @var ncenterliteModel $oNcenterliteModel */ $oNcenterliteModel = getModel('ncenterlite'); $target_srl = Context::get('target_srl'); diff --git a/modules/ncenterlite/skins/default/unsubscribe.html b/modules/ncenterlite/skins/default/unsubscribe.html index 5e00723ae..340fbb4d0 100644 --- a/modules/ncenterlite/skins/default/unsubscribe.html +++ b/modules/ncenterlite/skins/default/unsubscribe.html @@ -1,14 +1,13 @@ -
-
+

{$XE_VALIDATOR_MESSAGE}

- + @@ -18,46 +17,45 @@ -
-
- + +
+

{$lang->ncenterlite_cmd_unsubscribe_settings}

+
+ +
+
+

+ {$type} +

+

+ + {escape($unsubscribeData->text, false)} + + {escape($text, false)} + +

+
+
+ +
+ +
-

- {$type} -

-
-
-
- -
-

- - {escape($unsubscribeData->text, false)} - - {escape($text, false)} - -

-
-
- -
- -
-
-
-
-
- -
+
+ +
+ + +
- diff --git a/modules/ncenterlite/skins/default_bottom/unsubscribe.html b/modules/ncenterlite/skins/default_bottom/unsubscribe.html index 71d0f9dde..f4faf4ad1 100644 --- a/modules/ncenterlite/skins/default_bottom/unsubscribe.html +++ b/modules/ncenterlite/skins/default_bottom/unsubscribe.html @@ -1,5 +1,4 @@ -
@@ -18,46 +17,45 @@ -
-
- + +
+

{$lang->ncenterlite_cmd_unsubscribe_settings}

+
+ +
+
+

+ {$type} +

+

+ + {escape($unsubscribeData->text, false)} + + {escape($text, false)} + +

+
+
+ +
+ +
-

- {$type} -

-
-
-
- -
-

- - {escape($unsubscribeData->text, false)} - - {escape($text, false)} - -

-
-
- -
- -
-
-
-
-
- -
+
+ +
+ + +
- From 579beca876b30b3a897ed20c02a8dab648899a1d Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sat, 10 Apr 2021 18:42:00 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=88=98=EC=8B=A0?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=8C=9D=EC=97=85=EC=8B=9C=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=9D=84=20=EC=99=84=EB=A3=8C=ED=95=98=EA=B3=A0=20?= =?UTF-8?q?=EC=B0=BD=EC=9D=84=20=EB=8B=AB=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ncenterlite/ncenterlite.controller.php | 21 ++++++++++++++++--- .../skins/default/unsubscribe.html | 13 ++++++------ .../skins/default/unsubscribeList.html | 1 + .../skins/default_bottom/unsubscribe.html | 7 ++++++- .../skins/default_bottom/unsubscribeList.html | 1 + 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 7c4ff255b..7d7a5736a 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -274,15 +274,30 @@ class ncenterliteController extends ncenterlite return $output; } } + $this->setMessage('success_updated'); - if (Context::get('success_return_url')) + if(Context::get('is_popup') != 'Y') { - $this->setRedirectUrl(Context::get('success_return_url')); + if (Context::get('success_return_url')) + { + $this->setRedirectUrl(Context::get('success_return_url')); + } + else + { + $this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'member_srl', $this->user->member_srl)); + } } else { - $this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'member_srl', $this->user->member_srl)); + if (Context::get('success_return_url')) + { + $this->setRedirectUrl(Context::get('success_return_url')); + } + else + { + $this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'target_srl', $obj->target_srl, 'unsubscribe_type', $obj->unsubscribe_type)); + } } } diff --git a/modules/ncenterlite/skins/default/unsubscribe.html b/modules/ncenterlite/skins/default/unsubscribe.html index 340fbb4d0..f1ee35cb8 100644 --- a/modules/ncenterlite/skins/default/unsubscribe.html +++ b/modules/ncenterlite/skins/default/unsubscribe.html @@ -1,13 +1,9 @@
- -
-

{$XE_VALIDATOR_MESSAGE}

-
- + @@ -17,7 +13,8 @@ - + +

{$lang->ncenterlite_cmd_unsubscribe_settings}

@@ -59,3 +56,7 @@
+ diff --git a/modules/ncenterlite/skins/default/unsubscribeList.html b/modules/ncenterlite/skins/default/unsubscribeList.html index 5ff6b8ec5..65257455d 100644 --- a/modules/ncenterlite/skins/default/unsubscribeList.html +++ b/modules/ncenterlite/skins/default/unsubscribeList.html @@ -36,6 +36,7 @@ + - + +

{$lang->ncenterlite_cmd_unsubscribe_settings}

@@ -59,3 +60,7 @@
+ diff --git a/modules/ncenterlite/skins/default_bottom/unsubscribeList.html b/modules/ncenterlite/skins/default_bottom/unsubscribeList.html index a92eb739a..00dfa4ff8 100644 --- a/modules/ncenterlite/skins/default_bottom/unsubscribeList.html +++ b/modules/ncenterlite/skins/default_bottom/unsubscribeList.html @@ -36,6 +36,7 @@ +