remove communication notify

This commit is contained in:
BJRambo 2016-03-19 16:14:37 +09:00
parent 3f87cba257
commit 322aec9fab
2 changed files with 21 additions and 46 deletions

View file

@ -10,10 +10,11 @@ class communication extends ModuleObject
{ {
private $triggers = array( private $triggers = array(
array('moduleHandler.init', 'communication', 'controller', 'triggerModuleHandlerBefore', 'before'), array('moduleHandler.init', 'communication', 'controller', 'triggerModuleHandlerBefore', 'before'),
array('moduleObject.proc', 'communication', 'controller', 'triggerModuleProcAfter', 'after'),
array('member.getMemberMenu', 'communication', 'controller', 'triggerMemberMenu', 'before') array('member.getMemberMenu', 'communication', 'controller', 'triggerMemberMenu', 'before')
); );
private $delete_triggers = array(
array('moduleObject.proc', 'communication', 'controller', 'triggerModuleProcAfter', 'after')
);
/** /**
* Implement if additional tasks are necessary when installing * Implement if additional tasks are necessary when installing
* @return Object * @return Object
@ -48,7 +49,15 @@ class communication extends ModuleObject
return TRUE; return TRUE;
} }
} }
foreach($this->delete_triggers as $trigger)
{
if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
{
return TRUE;
}
}
if(!is_dir("./files/member_extra_info/new_message_flags")) if(!is_dir("./files/member_extra_info/new_message_flags"))
{ {
return TRUE; return TRUE;
@ -73,7 +82,15 @@ class communication extends ModuleObject
$oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]); $oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);
} }
} }
foreach($this->delete_triggers as $trigger)
{
if($oModuleModel->getTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]))
{
return TRUE;
}
}
if(!is_dir("./files/member_extra_info/new_message_flags")) if(!is_dir("./files/member_extra_info/new_message_flags"))
{ {
FileHandler::makeDir('./files/member_extra_info/new_message_flags'); FileHandler::makeDir('./files/member_extra_info/new_message_flags');

View file

@ -813,49 +813,7 @@ class communicationController extends communication
$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend'); $oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
} }
} }
function triggerModuleProcAfter($obj)
{
if (!Context::get('is_logged') || $obj->module == 'member' || $obj->module == 'admin')
{
return new Object();
}
$ncenterlite_config = getModel('ncenterlite')->getConfig();
if($ncenterlite_config->message_notify == 'Y' && $ncenterlite_config->use == 'Y')
{
return new Object();
}
$config = getModel('communication')->getConfig();
if ($config->enable_message == 'N' || starts_with('dispCommunication', Context::get('act')))
{
return new Object();
}
$logged_info = Context::get('logged_info');
if ($config->enable_message == 'Y')
{
$flag_path = './files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl);
$flag_file = $flag_path . $logged_info->member_srl;
if(file_exists($flag_file))
{
// Pop-up to display messages if a flag on new message is set
$new_message_count = (int)trim(FileHandler::readFile($flag_file));
if($new_message_count > 0)
{
$text = escape_js(lang('alert_new_message_arrived'));
Context::addHtmlFooter("<script>jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
Context::loadFile(array('./modules/communication/tpl/js/member_communication.js'), true);
}
else
{
FileHandler::removeFile($flag_file);
}
}
}
}
function triggerMemberMenu() function triggerMemberMenu()
{ {
if(!Context::get('is_logged')) if(!Context::get('is_logged'))