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

Fix disappearing message & friend menu in other places, too

Browse source
This commit is contained in:
Kijin Sung 2016-03-16 19:19:53 +09:00
parent e9ca45eac7
commit 9fc1926dc3
2 changed files with 15 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -799,29 +799,10 @@ class communicationController extends communication
function triggerModuleHandlerBefore($obj) function triggerModuleHandlerBefore($obj)
{ {
return $this->triggerModuleProcAfter($obj);
}
function triggerModuleProcAfter($obj)
{
if(!Context::get('is_logged') || $obj->module == 'member')
{
return new Object();
}
$logged_info = Context::get('logged_info');
$oCommunicationModel = getModel('communication');
$config = $oCommunicationModel->getConfig();
if($obj->module == 'admin')
{
return new Object();
}
if($config->enable_message == 'N' && $config->enable_friend == 'N')
{
return new Object();
}
// Add menus on the member login information // Add menus on the member login information
$config = getModel('communication')->getConfig();
$oMemberController = getController('member'); $oMemberController = getController('member');
if($config->enable_message == 'Y') if($config->enable_message == 'Y')
{ {
$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box'); $oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
@ -831,13 +812,23 @@ 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();
}
if (starts_with('dispCommunication', Context::get('act'))) $config = getModel('communication')->getConfig();
if ($config->enable_message == 'N' || starts_with('dispCommunication', Context::get('act')))
{ {
return new Object(); return new Object();
} }
if($config->enable_message == 'Y' && $obj->act != 'dispCommunicationNewMessage') $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_path = './files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl);
$flag_file = $flag_path . $logged_info->member_srl; $flag_file = $flag_path . $logged_info->member_srl;