From 300fe98e6753e339ea01dd201306bd95bef27801 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Tue, 2 May 2017 03:36:41 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=EC=8B=9C=20=EC=BA=90=EC=8B=9C=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=EB=82=A8=EC=95=84=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ncenterlite.admin.controller.php | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 75fd13757..412775dba 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -165,11 +165,15 @@ class ncenterliteAdminController extends ncenterlite $this->setMessage('ncenterlite_message_delete_notification_all'); } - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) + $this->removeAllFlagFile(); + + if(Context::get('success_return_url')) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminList'); - header('location: ' .$returnUrl); - return; + $this->setRedirectUrl(Context::get('success_return_url')); + } + else + { + $this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminList')); } } @@ -200,4 +204,13 @@ class ncenterliteAdminController extends ncenterlite $this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminCustomList')); } } + + function removeAllFlagFile() + { + $flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/'; + if(FileHandler::isDir($flag_path)) + { + FileHandler::removeFilesInDir($flag_path); + } + } }