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

Merge branch 'pr/55' into develop

Browse source 
Conflicts:
	modules/communication/communication.controller.php
This commit is contained in:
bnu 2013-11-23 20:18:20 +09:00
commit bf85de4e26
8 changed files with 109 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,8 +114,13 @@ class communicationController extends communication
// send a message
$output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
if(!$output->toBool())
{
return $output;
}
// send an e-mail
if($output->toBool() && $send_mail == 'Y')
if($send_mail == 'Y')
{
$view_url = Context::getRequestUri();
$content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>", $content, $view_url, $view_url);
@ -196,12 +201,16 @@ class communicationController extends communication
// Call a trigger (before)
$trigger_obj = new stdClass();
$trigger_obj->sender = $sender_args;
$trigger_obj->receiver = $receiver_args;
$trigger_output = ModuleHandler::triggerCall('communication.sendMessage', 'before', $trigger_obj);
if(!$trigger_output->toBool())
$trigger_obj->sender_srl = $sender_srl;
$trigger_obj->receiver_srl = $receiver_srl;
$trigger_obj->message_srl = $message_srl;
$trigger_obj->title = $title;
$trigger_obj->content = $content;
$trigger_obj->sender_log = $sender_log;
$triggerOutput = ModuleHandler::triggerCall('communication.sendMessage', 'before', $trigger_obj);
if(!$triggerOutput->toBool())
{
return $trigger_output;
return $triggerOutput;
}
$oDB = DB::getInstance();