From 814519a2aa22f94992895c416c30e819cf9ad815 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 4 May 2017 12:33:31 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EC=82=AD=EC=A0=9C=ED=95=A0=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=ED=95=B4=EB=8B=B9=20=EC=82=AD=EC=A0=9C=EB=82=A0?= =?UTF-8?q?=EC=9E=90=EB=A5=BC=20=EA=B8=B0=EB=A1=9D=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=B8=8C=EC=A0=9D=ED=8A=B8=EB=A5=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=98=EA=B3=A0=20=EC=95=88=EC=97=90=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ncenterlite.admin.controller.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 412775dba..42cc880c8 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -165,7 +165,15 @@ class ncenterliteAdminController extends ncenterlite $this->setMessage('ncenterlite_message_delete_notification_all'); } - $this->removeAllFlagFile(); + $flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/regdate_new.php'; + if(!FileHandler::isDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify')) + { + FileHandler::makeDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/'); + } + $reg_obj = new stdClass(); + $reg_obj->regdate = date('YmdHis'); + $buff = "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); - } - } } From 68cac0b686236eaa82c4bdcd1eea7e6560984d19 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 4 May 2017 12:34:35 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=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.admin.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 42cc880c8..f96877945 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -165,7 +165,7 @@ class ncenterliteAdminController extends ncenterlite $this->setMessage('ncenterlite_message_delete_notification_all'); } - $flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/regdate_new.php'; + $flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php'; if(!FileHandler::isDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify')) { FileHandler::makeDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/'); From b7be95796262f71013248d43691cf8fdaf75ef0a Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 4 May 2017 13:13:17 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=EC=BA=90=EC=8B=9C?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EB=94=94=EB=B9=84=EB=A5=BC=20?= =?UTF-8?q?=EC=A7=80=EC=9A=B4=20=EC=8B=9C=EC=A0=90=EC=9D=98=20=EC=9D=B4?= =?UTF-8?q?=EC=A0=84=EC=9D=BC=EC=9D=BC=EA=B2=BD=EC=9A=B0=20=EC=BA=90?= =?UTF-8?q?=EC=8B=9C=ED=8C=8C=EC=9D=BC=20=EC=9E=AC=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ncenterlite.admin.controller.php | 2 +- .../ncenterlite/ncenterlite.controller.php | 2 +- modules/ncenterlite/ncenterlite.model.php | 26 ++++++++++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index f96877945..f2ea3b0f1 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -171,7 +171,7 @@ class ncenterliteAdminController extends ncenterlite FileHandler::makeDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/'); } $reg_obj = new stdClass(); - $reg_obj->regdate = date('YmdHis'); + $reg_obj->regdate = time(); $buff = "flag_exists = true; - return $output; + $deleteOutput = require_once $deleteFlagPath; + if(is_object($deleteOutput)) + { + $create_time = filemtime($flag_path); + + if($create_time <= $deleteOutput->regdate) + { + $oNcenterliteController = getController('ncenterlite'); + $oNcenterliteController->removeFlagFile($member_srl); + } + else + { + $output = require_once $flag_path; + if(is_object($output)) + { + $output->flag_exists = true; + return $output; + } + } + } } } $args = new stdClass(); From 28e3de77bbb0978e47ecbe57308e04365cc7c6d8 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 4 May 2017 13:16:56 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=8A=A4=ED=83=9C=ED=8B=B1=20=EC=84=A0?= =?UTF-8?q?=EC=96=B8=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=98=B8=ED=99=98?= =?UTF-8?q?=EC=84=B1=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ncenterlite/ncenterlite.controller.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 392f94388..d4cb57daf 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -65,7 +65,7 @@ class ncenterliteController extends ncenterlite } else { - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); } return new Object(); } @@ -443,7 +443,7 @@ class ncenterliteController extends ncenterlite foreach($member_srls as $member_srl) { //Remove flag files - self::removeFlagFile($member_srl); + $this->removeFlagFile($member_srl); } } @@ -498,7 +498,7 @@ class ncenterliteController extends ncenterlite foreach($member_srls as $member_srl) { //Remove flag files - self::removeFlagFile($member_srl); + $this->removeFlagFile($member_srl); } } return new Object(); @@ -548,7 +548,7 @@ class ncenterliteController extends ncenterlite if($output_update->toBool()) { //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); } } } @@ -570,7 +570,7 @@ class ncenterliteController extends ncenterlite if($outputs->toBool()) { //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); } } } @@ -617,7 +617,7 @@ class ncenterliteController extends ncenterlite if($update_output->toBool()) { //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); } } } @@ -678,7 +678,7 @@ class ncenterliteController extends ncenterlite if($output->toBool()) { //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); } } } @@ -692,7 +692,7 @@ class ncenterliteController extends ncenterlite if($output->toBool()) { //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); } } @@ -923,7 +923,7 @@ class ncenterliteController extends ncenterlite //$output = executeQuery('ncenterlite.deleteNotify', $args); //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); return $output; } @@ -936,7 +936,7 @@ class ncenterliteController extends ncenterlite //$output = executeQuery('ncenterlite.deleteNotifyByTargetSrl', $args); //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); return $output; } @@ -948,7 +948,7 @@ class ncenterliteController extends ncenterlite //$output = executeQuery('ncenterlite.deleteNotifyByMemberSrl', $args); //Remove flag files - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); return $output; } @@ -1096,7 +1096,7 @@ class ncenterliteController extends ncenterlite } } - self::removeFlagFile($args->member_srl); + $this->removeFlagFile($args->member_srl); return $output; } From 57efa88272a6090e76369eabd46900850d83a99f Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 4 May 2017 17:33:05 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=BA=90=EC=8B=9C=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=A7=8C=EB=93=9C=EB=8A=94=20=EB=B0=A9=EC=8B=9D=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.admin.controller.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index f2ea3b0f1..6feb287f0 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -165,15 +165,11 @@ class ncenterliteAdminController extends ncenterlite $this->setMessage('ncenterlite_message_delete_notification_all'); } - $flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php'; - if(!FileHandler::isDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify')) - { - FileHandler::makeDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/'); - } $reg_obj = new stdClass(); $reg_obj->regdate = time(); - $buff = " Date: Fri, 5 May 2017 21:49:55 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=AF=B9=EC=8A=A4=20read?= =?UTF-8?q?PHPData=ED=95=9C=EC=88=98=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.model.php | 35 +++++++++++------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 104082686..0616016e4 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -225,30 +225,29 @@ class ncenterliteModel extends ncenterlite if(FileHandler::exists($flag_path) && $page <= 1) { $deleteFlagPath = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php'; - if(FileHandler::exists($deleteFlagPath)) - { - $deleteOutput = require_once $deleteFlagPath; - if(is_object($deleteOutput)) - { - $create_time = filemtime($flag_path); - if($create_time <= $deleteOutput->regdate) + $deleteOutput = Rhymix\Framework\Storage::readPHPData($deleteFlagPath); + if($deleteOutput !== false) + { + $create_time = filemtime($flag_path); + + if($create_time <= $deleteOutput->regdate) + { + $oNcenterliteController = getController('ncenterlite'); + $oNcenterliteController->removeFlagFile($member_srl); + } + else + { + $output = require_once $flag_path; + if(is_object($output)) { - $oNcenterliteController = getController('ncenterlite'); - $oNcenterliteController->removeFlagFile($member_srl); - } - else - { - $output = require_once $flag_path; - if(is_object($output)) - { - $output->flag_exists = true; - return $output; - } + $output->flag_exists = true; + return $output; } } } } + $args = new stdClass(); $args->member_srl = $member_srl; $args->page = $page ? $page : 1; From b45523f37c31d76dffccc78e7fb68aeb29f121eb Mon Sep 17 00:00:00 2001 From: BJRambo Date: Fri, 5 May 2017 21:52:27 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=95=84=EB=9E=98=EC=AA=BD=20=ED=94=8C?= =?UTF-8?q?=EB=9E=98=EA=B7=B8=ED=8C=8C=EC=9D=BC=EC=97=90=EB=8F=84=20readPH?= =?UTF-8?q?PData=ED=95=A8=EC=88=98=20=EC=82=AC=EC=9A=A9?= 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 0616016e4..edf962e11 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -238,8 +238,8 @@ class ncenterliteModel extends ncenterlite } else { - $output = require_once $flag_path; - if(is_object($output)) + $output = Rhymix\Framework\Storage::readPHPData($flag_path); + if($output !== false) { $output->flag_exists = true; return $output;