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

Move trigger to moduleObject.proc.after for better consistency

Browse source
This commit is contained in:
Kijin Sung 2016-03-16 14:48:54 +09:00
parent 4b2bced0eb
commit 488704acf0
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/communication/communication.class.php
View file

@ -9,9 +9,12 @@
class communication extends ModuleObject
{
private $triggers = array(
array('moduleHandler.init', 'communication', 'controller', 'triggerModuleHandlerBefore', 'before'),
array('moduleObject.proc', 'communication', 'controller', 'triggerModuleProcAfter', 'after'),
array('member.getMemberMenu', 'communication', 'controller', 'triggerMemberMenu', 'before')
);
private $delete_triggers = array(
array('moduleHandler.init', 'communication', 'controller', 'triggerModuleHandlerBefore', 'before'),
);
/**
* Implement if additional tasks are necessary when installing
@ -47,6 +50,13 @@ class communication extends ModuleObject
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"))
{
@ -72,6 +82,13 @@ class communication extends ModuleObject
$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]))
{
$oModuleController->deleteTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]);
}
}
if(!is_dir("./files/member_extra_info/new_message_flags"))
{

5
modules/communication/communication.controller.php
View file

@ -798,6 +798,11 @@ class communicationController extends communication
}
function triggerModuleHandlerBefore($obj)
{
return $this->triggerModuleProcAfter($obj);
}
function triggerModuleProcAfter($obj)
{
if(!Context::get('is_logged') || $obj->module == 'member')
{