fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

주석 코드와 사용하지 않는 쿼리 삭제

Browse source
This commit is contained in:
BJRambo 2018-09-17 20:52:12 +09:00
parent 15ab8b5353
commit 45892d7419
3 changed files with 12 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

43
modules/ncenterlite/ncenterlite.controller.php
View file

@ -548,19 +548,6 @@ class ncenterliteController extends ncenterlite
{
return;
}
$this->_hide_ncenterlite = false;
if($oModule->module == 'beluxe' && Context::get('is_modal'))
{
$this->_hide_ncenterlite = true;
}
if($oModule->module == 'bodex' && Context::get('is_iframe'))
{
$this->_hide_ncenterlite = true;
}
if($oModule->getLayoutFile() == 'popup_layout.html')
{
$this->_hide_ncenterlite = true;
}
if($oModule->act == 'dispBoardReplyComment')
{
@ -644,7 +631,7 @@ class ncenterliteController extends ncenterlite
}
// 지식인 모듈의 의견
// TODO: 코드 분리
// TODO: 지식인 모듈을 사용하는지 안하는지 현재로써는 모르기 때문에 일단은 이 코드를 유지 하였다가 나중에 라이믹스용 지식인이 나온다면 변경하기
if($oModule->act == 'procKinInsertComment')
{
// 글, 댓글 구분
@ -720,7 +707,6 @@ class ncenterliteController extends ncenterlite
function triggerBeforeDisplay(&$output_display)
{
$act = Context::get('act');
// 팝업창이면 중지
if(Context::get('ncenterlite_is_popup'))
{
@ -728,7 +714,7 @@ class ncenterliteController extends ncenterlite
}
// 자신의 알림목록을 보고 있을 경우엔 알림센터창을 띄우지 않는다.
if($act == 'dispNcenterliteNotifyList')
if(Context::get('act') == 'dispNcenterliteNotifyList')
{
return;
}
@ -752,7 +738,6 @@ class ncenterliteController extends ncenterlite
$module_info = Context::get('module_info');
// admin 모듈이면 중지
if($module_info->module == 'admin')
{
@ -774,20 +759,19 @@ class ncenterliteController extends ncenterlite
}
// 노티바 제외 페이지이면 중지
if(in_array($module_info->module_srl, $config->hide_module_srls))
if(is_array($config->hide_module_srls) && in_array($module_info->module_srl, $config->hide_module_srls))
{
return;
}
Context::set('ncenterlite_config', $config);
Context::loadFile(array('./modules/ncenterlite/tpl/js/ncenterlite.js', 'body', '', 100000));
$js_args = array('./modules/ncenterlite/tpl/js/ncenterlite.js', 'body', '', 100000);
Context::loadFile($js_args);
// 알림 목록 가져오기
$logged_info = Context::get('logged_info');
$_output = $oNcenterliteModel->getMyNotifyList($logged_info->member_srl);
// 알림 메시지가 없어도 항상 표시하게 하려면 이 줄을 제거 또는 주석 처리하세요.
// TODO : 메세지 없더라도 표시하도록 하는 옵션 추가
if(!$_output->data)
{
return;
@ -857,6 +841,11 @@ class ncenterliteController extends ncenterlite
$target_srl = Context::get('target_srl');
$oMemberController->addMemberMenu('dispNcenterliteNotifyList', 'ncenterlite_my_list');
}
if($config->user_notify_setting == 'Y')
{
$oMemberController->addMemberMenu('dispNcenterliteUserConfig', 'ncenterlite_my_settings');
if($logged_info->is_admin == 'Y')
{
@ -865,11 +854,6 @@ class ncenterliteController extends ncenterlite
$oMemberController->addMemberPopupMenu($url, $str, '');
}
}
if($config->user_notify_setting == 'Y')
{
$oMemberController->addMemberMenu('dispNcenterliteUserConfig', 'ncenterlite_my_settings');
}
}
function _addFile()
@ -931,7 +915,6 @@ class ncenterliteController extends ncenterlite
$args->member_srl = $member_srl;
$args->notify = $notify;
$output = executeQuery('ncenterlite.updateNotifyReaded', $args);
//$output = executeQuery('ncenterlite.deleteNotify', $args);
//Remove flag files
$this->removeFlagFile($args->member_srl);
@ -944,7 +927,6 @@ class ncenterliteController extends ncenterlite
$args->member_srl = $member_srl;
$args->target_srl = $target_srl;
$output = executeQuery('ncenterlite.updateNotifyReadedByTargetSrl', $args);
//$output = executeQuery('ncenterlite.deleteNotifyByTargetSrl', $args);
//Remove flag files
$this->removeFlagFile($args->member_srl);
@ -956,7 +938,6 @@ class ncenterliteController extends ncenterlite
$args = new stdClass();
$args->member_srl = $member_srl;
$output = executeQuery('ncenterlite.updateNotifyReadedAll', $args);
//$output = executeQuery('ncenterlite.deleteNotifyByMemberSrl', $args);
//Remove flag files
$this->removeFlagFile($args->member_srl);

10
modules/ncenterlite/queries/deleteNotify.xml
View file

@ -1,10 +0,0 @@
<query id="deleteNotify" action="delete">
<tables>
<table name="ncenterlite_notify" />
</tables>
<conditions>
<condition operation="equal" column="notify" var="notify" notnull="notnull" />
<condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" pipe="and" />
</conditions>
</query>

10
modules/ncenterlite/queries/deleteNotifyByTargetSrl.xml
View file

@ -1,10 +0,0 @@
<query id="deleteNotifyByTargetSrl" action="delete">
<tables>
<table name="ncenterlite_notify" />
</tables>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="target_srl" var="srl" filter="number" notnull="notnull" pipe="and" />
</conditions>
</query>