Merge pull request #456 from bjrambo/pr/ncenterlite-fixed-error

알림센터가 캐시파일을 생성해놓고도 재대로 사용하지 않던 문제점 고침.
This commit is contained in:
BJRambo 2016-04-30 16:36:29 +09:00
commit a8e53eb150
2 changed files with 27 additions and 10 deletions

View file

@ -658,10 +658,8 @@ class ncenterliteController extends ncenterlite
return;
}
$logged_info = Context::get('logged_info');
// 로그인 상태가 아니면 중지
if(!$logged_info)
if(!Context::get('is_logged'))
{
return;
}
@ -707,8 +705,6 @@ class ncenterliteController extends ncenterlite
$js_args = array('./modules/ncenterlite/tpl/js/ncenterlite.js', 'body', '', 100000);
Context::loadFile($js_args);
$oNcenterliteModel = getModel('ncenterlite');
// 알림 목록 가져오기
$logged_info = Context::get('logged_info');
$_output = $oNcenterliteModel->getMyNotifyList($logged_info->member_srl);
@ -855,6 +851,12 @@ class ncenterliteController extends ncenterlite
$output = executeQuery('ncenterlite.updateNotifyReaded', $args);
//$output = executeQuery('ncenterlite.deleteNotify', $args);
//Remove flag files
$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->member_srl) . $args->member_srl . '.php';
if(file_exists($flag_path))
{
FileHandler::removeFile($flag_path);
}
return $output;
}
@ -866,6 +868,12 @@ class ncenterliteController extends ncenterlite
$output = executeQuery('ncenterlite.updateNotifyReadedByTargetSrl', $args);
//$output = executeQuery('ncenterlite.deleteNotifyByTargetSrl', $args);
//Remove flag files
$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->member_srl) . $args->member_srl . '.php';
if(file_exists($flag_path))
{
FileHandler::removeFile($flag_path);
}
return $output;
}
@ -876,6 +884,12 @@ class ncenterliteController extends ncenterlite
$output = executeQuery('ncenterlite.updateNotifyReadedAll', $args);
//$output = executeQuery('ncenterlite.deleteNotifyByMemberSrl', $args);
//Remove flag files
$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->member_srl) . $args->member_srl . '.php';
if(file_exists($flag_path))
{
FileHandler::removeFile($flag_path);
}
return $output;
}
@ -1022,7 +1036,7 @@ class ncenterliteController extends ncenterlite
}
}
$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->target_member_srl) . $args->target_member_srl . '.php';
$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($args->member_srl) . $args->member_srl . '.php';
if(file_exists($flag_path))
{
//remove flag files
@ -1044,7 +1058,7 @@ class ncenterliteController extends ncenterlite
return;
}
FileHandler::makeDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify' . getNumberingPath($member_srl));
FileHandler::makeDir(\RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($member_srl));
$buff = "<?php return unserialize(" . var_export(serialize($output), true) . ");\n";
FileHandler::writeFile($flag_path, $buff);
}

View file

@ -215,7 +215,8 @@ class ncenterliteModel extends ncenterlite
}
$output->data = $list;
if($page <= 1)
if($page <= 1 && $output->flag_exists !== true)
{
$oNcenterliteController = getController('ncenterlite');
$oNcenterliteController->updateFlagFile($member_srl, $output);
@ -256,11 +257,13 @@ class ncenterliteModel extends ncenterlite
$member_srl = $logged_info->member_srl;
}
$flag_path = \RX_BASEDIR . 'files/cache/ncenterlite/new_notify/' . getNumberingPath($member_srl) . $member_srl . '.php';
if(FileHandler::exists($flag_path) && $page <= 1)
{
$output = require_once $flag_path;
if(is_object($output->data))
if(is_object($output))
{
$output->flag_exists = true;
return $output;
}
}
@ -269,7 +272,7 @@ class ncenterliteModel extends ncenterlite
$args->page = $page ? $page : 1;
if($readed) $args->readed = $readed;
$output = executeQueryArray('ncenterlite.getNotifyList', $args);
$output->flag_exists = false;
if(!$output->data) $output->data = array();
return $output;