diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 412775dba..6feb287f0 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -165,7 +165,11 @@ class ncenterliteAdminController extends ncenterlite $this->setMessage('ncenterlite_message_delete_notification_all'); } - $this->removeAllFlagFile(); + $reg_obj = new stdClass(); + $reg_obj->regdate = time(); + + $flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php'; + Rhymix\Framework\Storage::writePHPData($flag_path, $reg_obj); if(Context::get('success_return_url')) { @@ -204,13 +208,4 @@ 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); - } - } } diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 591f8dedf..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; } @@ -1118,7 +1118,7 @@ class ncenterliteController extends ncenterlite FileHandler::writeFile($flag_path, $buff); } - public static function removeFlagFile($member_srl = null) + public function removeFlagFile($member_srl = null) { if($member_srl === null) { diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 54ff10e8a..edf962e11 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -224,13 +224,30 @@ class ncenterliteModel extends ncenterlite if(FileHandler::exists($flag_path) && $page <= 1) { - $output = require_once $flag_path; - if(is_object($output)) + $deleteFlagPath = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/delete_date.php'; + + $deleteOutput = Rhymix\Framework\Storage::readPHPData($deleteFlagPath); + if($deleteOutput !== false) { - $output->flag_exists = true; - return $output; + $create_time = filemtime($flag_path); + + if($create_time <= $deleteOutput->regdate) + { + $oNcenterliteController = getController('ncenterlite'); + $oNcenterliteController->removeFlagFile($member_srl); + } + else + { + $output = Rhymix\Framework\Storage::readPHPData($flag_path); + if($output !== false) + { + $output->flag_exists = true; + return $output; + } + } } } + $args = new stdClass(); $args->member_srl = $member_srl; $args->page = $page ? $page : 1;