From dbaada29a677f1cd0a02a4373b4649833c18246a Mon Sep 17 00:00:00 2001 From: BJRambo Date: Mon, 31 Jul 2017 22:58:29 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=ED=84=B4=EB=B0=A9=EC=8B=9D=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC=20=EB=B0=8F=20=EC=9E=A0=EA=B8=88=EC=8B=9C=20?= =?UTF-8?q?=EC=9D=BC=EB=B0=98=ED=9A=8C=EC=9B=90=EC=9D=B4=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=EC=84=BC=ED=84=B0=EB=A5=BC=20=ED=99=95=EC=9D=B8?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=97=86=EB=8F=84=EB=A1=9D=20=EA=B3=A0?= =?UTF-8?q?=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ncenterlite/ncenterlite.controller.php | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 0d03703f4..6f07da9ab 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -710,33 +710,38 @@ class ncenterliteController extends ncenterlite // 팝업창이면 중지 if(Context::get('ncenterlite_is_popup')) { - return; + return new Object(); } // 자신의 알림목록을 보고 있을 경우엔 알림센터창을 띄우지 않는다. if($act == 'dispNcenterliteNotifyList') { - return; + return new Object(); + } + + if(config('lock.locked') && Context::get('logged_info')->is_admin !== 'Y') + { + return new Object(); } if(count($this->disable_notify_bar_act)) { if(in_array(Context::get('act'), $this->disable_notify_bar_act)) { - return; + return new Object(); } } // HTML 모드가 아니면 중지 + act에 admin이 포함되어 있으면 중지 if(Context::getResponseMethod() != 'HTML' || strpos(strtolower(Context::get('act')), 'admin') !== false) { - return; + return new Object(); } // 로그인 상태가 아니면 중지 if(!Context::get('is_logged')) { - return; + return new Object(); } $module_info = Context::get('module_info'); @@ -745,14 +750,14 @@ class ncenterliteController extends ncenterlite { if(in_array($module_info->mid, $this->disable_notify_bar_mid)) { - return; + return new Object(); } } // admin 모듈이면 중지 if($module_info->module == 'admin') { - return; + return new Object(); } $oNcenterliteModel = getModel('ncenterlite'); @@ -786,7 +791,7 @@ class ncenterliteController extends ncenterlite // 알림 메시지가 없어도 항상 표시하게 하려면 이 줄을 제거 또는 주석 처리하세요. if(!$_output->data) { - return; + return new Object(); } $_latest_notify_id = array_slice($_output->data, 0, 1); @@ -795,7 +800,7 @@ class ncenterliteController extends ncenterlite if($_COOKIE['_ncenterlite_hide_id'] && $_COOKIE['_ncenterlite_hide_id'] == $_latest_notify_id) { - return; + return new Object(); } setcookie('_ncenterlite_hide_id', '', 0, '/');