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

Fix inconsistent assignment of sender address in member emails

Browse source
This commit is contained in:
Kijin Sung 2017-06-29 17:26:07 +09:00
parent 986f532ba5
commit 0920172c1e
2 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/advanced_mailer/advanced_mailer.controller.php
View file

@ -27,7 +27,11 @@ class Advanced_MailerController extends Advanced_Mailer
if (!$mail->getFrom())
{
$mail->setFrom($config->sender_email, $config->sender_name ?: null);
$mail->setFrom(config('mail.default_from'), config('mail.default_name'));
if ($replyTo = config('mail.default_reply_to'))
{
$mail->setReplyTo($replyTo);
}
}
elseif (toBool($config->force_sender))
{
@ -39,9 +43,9 @@ class Advanced_MailerController extends Advanced_Mailer
{
$original_sender_email = array_first_key($mail->message->getFrom());
$original_sender_name = array_first($mail->message->getFrom());
if ($original_sender_email !== $config->sender_email)
if ($original_sender_email !== config('mail.default_from'))
{
$mail->setFrom($config->sender_email, $original_sender_name ?: $config->sender_name);
$mail->setFrom(config('mail.default_from'), $original_sender_name ?: config('mail.default_name'));
$mail->setReplyTo($original_sender_email);
}
}

52
modules/member/member.controller.php
View file

@ -1149,16 +1149,18 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'find_member_account_mail');
// Get information of the Webmaster
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
// Send a mail
$oMail = new Mail();
$oMail->setTitle( lang('msg_find_account_title') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject(lang('msg_find_account_title'));
$oMail->setBody($content);
$oMail->addTo($member_info->email_address, $member_info->nick_name);
$oMail->send();
// Return message
$msg = sprintf(lang('msg_auth_mail_sent'), $member_info->email_address);
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
@ -1376,12 +1378,12 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
// Send a mail
$oMail = new Mail();
$oMail->setTitle( lang('msg_confirm_account_title') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject(lang('msg_confirm_account_title'));
$oMail->setBody($content);
$oMail->addTo($member_info->email_address, $member_info->nick_name);
$oMail->send();
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
@ -1503,12 +1505,12 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
// Send a mail
$oMail = new Mail();
$oMail->setTitle( lang('msg_confirm_account_title') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject(lang('msg_confirm_account_title'));
$oMail->setBody($content);
$oMail->addTo($member_info->email_address, $member_info->nick_name);
$oMail->send();
}
@ -1891,11 +1893,10 @@ class memberController extends member
{
$view_url = Context::getRequestUri();
$content = sprintf("%s<hr /><p>From: <a href=\"%s\" target=\"_blank\">%s</a><br />To: %s(%s)</p>",$content, $view_url, $view_url, $member_info->nick_name, $member_info->email_id);
$oMail = new Mail();
$oMail->setTitle($title);
$oMail->setContent($content);
$oMail->setSender($config->webmaster_name?$config->webmaster_name:'webmaster', $config->webmaster_email);
$oMail->setReceiptor($member_info->email_id.'('.$member_info->nick_name.')', $member_info->email_address);
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject($title);
$oMail->setBody($content);
$oMail->addTo($member_info->email_address, $member_info->email_id.' ('.$member_info->nick_name.')');
$oMail->send();
}
$output = executeQuery('member.deleteLoginCountHistoryByMemberSrl', $args);
@ -2744,12 +2745,11 @@ class memberController extends member
$oTemplate = &TemplateHandler::getInstance();
$content = $oTemplate->compile($tpl_path, 'confirm_member_new_email');
$oMail = new Mail();
$oMail->setTitle( lang('title_modify_email_address') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->nick_name, $newEmail );
$result = $oMail->send();
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject(lang('title_modify_email_address'));
$oMail->setBody($content);
$oMail->addTo($newEmail, $member_info->nick_name);
$oMail->send();
$msg = sprintf(lang('msg_confirm_mail_sent'), $newEmail);
$this->setMessage($msg);