mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-02 01:52:10 +09:00
Fix #1177 incorrect URL in notification email
멀티도메인 사용 등 특수한 경우에 도메인이 이중으로 들어갈 수 있음
This commit is contained in:
parent
b5720557e8
commit
4f20f0e8c1
1 changed files with 14 additions and 9 deletions
|
|
@ -1351,34 +1351,39 @@ class ncenterliteController extends ncenterlite
|
|||
switch ($args->config_type)
|
||||
{
|
||||
case 'admin_content':
|
||||
$mail_title = Context::getSiteTitle() . ' ' . lang('ncenterlite_admin_content');
|
||||
$mail_title = Context::getSiteTitle() . ' - ' . lang('ncenterlite_admin_content');
|
||||
break;
|
||||
case 'comment_comment':
|
||||
$mail_title = Context::getSiteTitle() . ' ' . lang('ncenterlite_comment_comment_noti');
|
||||
$mail_title = Context::getSiteTitle() . ' - ' . lang('ncenterlite_comment_comment_noti');
|
||||
break;
|
||||
case 'comment':
|
||||
$mail_title = Context::getSiteTitle() . ' ' . lang('ncenterlite_comment_noti');
|
||||
$mail_title = Context::getSiteTitle() . ' - ' . lang('ncenterlite_comment_noti');
|
||||
break;
|
||||
case 'message':
|
||||
$mail_title = Context::getSiteTitle() . ' ' . lang('ncenterlite_message_noti');
|
||||
$mail_title = Context::getSiteTitle() . ' - ' . lang('ncenterlite_message_noti');
|
||||
break;
|
||||
case 'vote':
|
||||
$mail_title = Context::getSiteTitle() . ' ' . lang('ncenterlite_vote_noti');
|
||||
$mail_title = Context::getSiteTitle() . ' - ' . lang('ncenterlite_vote_noti');
|
||||
break;
|
||||
case 'mention':
|
||||
$mail_title = Context::getSiteTitle() . ' ' . lang('ncenterlite_mention_noti');
|
||||
$mail_title = Context::getSiteTitle() . ' - ' . lang('ncenterlite_mention_noti');
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
$content = $content . '<br>' . Context::getSiteTitle() . '<br>' . Rhymix\Framework\URL::getCurrentDomainUrl($args->target_url);
|
||||
|
||||
$target_url = $args->target_url;
|
||||
if (!preg_match('!^https?://!', $target_url))
|
||||
{
|
||||
$target_url = Rhymix\Framework\URL::getCurrentDomainUrl($target_url);
|
||||
}
|
||||
|
||||
$mail_content = sprintf("<p>%s</p>\n<p>%s</p>\n", $content, $target_url);
|
||||
$member_info = getModel('member')->getMemberInfoByMemberSrl($args->member_srl);
|
||||
|
||||
$oMail = new \Rhymix\Framework\Mail();
|
||||
$oMail->setSubject($mail_title);
|
||||
$oMail->setBody($content);
|
||||
$oMail->setBody($mail_content);
|
||||
$oMail->addTo($member_info->email_address, $member_info->nick_name);
|
||||
$oMail->send();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue