fisharebest /
webtrees
@@ -37,15 +37,15 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message) { |
| 39 | 39 | try { |
| 40 | - $mail = \Swift_Message::newInstance() |
|
| 41 | - ->setSubject($subject) |
|
| 42 | - ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) |
|
| 43 | - ->setTo($to_email, $to_name) |
|
| 44 | - ->setReplyTo($replyto_email, $replyto_name) |
|
| 45 | - ->setBody($message, 'text/html') |
|
| 46 | - ->addPart(Filter::unescapeHtml($message), 'text/plain'); |
|
| 40 | + $mail = \Swift_Message::newInstance() |
|
| 41 | + ->setSubject($subject) |
|
| 42 | + ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) |
|
| 43 | + ->setTo($to_email, $to_name) |
|
| 44 | + ->setReplyTo($replyto_email, $replyto_name) |
|
| 45 | + ->setBody($message, 'text/html') |
|
| 46 | + ->addPart(Filter::unescapeHtml($message), 'text/plain'); |
|
| 47 | 47 | |
| 48 | - \Swift_Mailer::newInstance(self::transport())->send($mail); |
|
| 48 | + \Swift_Mailer::newInstance(self::transport())->send($mail); |
|
| 49 | 49 | } catch (\Exception $ex) { |
| 50 | 50 | Log::addErrorLog('Mail: ' . $ex->getMessage()); |
| 51 | 51 | |
@@ -85,20 +85,20 @@ discard block |
||
| 85 | 85 | case 'internal': |
| 86 | 86 | return \Swift_MailTransport::newInstance(); |
| 87 | 87 | case 'external': |
| 88 | - $transport = \Swift_SmtpTransport::newInstance() |
|
| 89 | - ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 90 | - ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 91 | - ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 88 | + $transport = \Swift_SmtpTransport::newInstance() |
|
| 89 | + ->setHost(Site::getPreference('SMTP_HOST')) |
|
| 90 | + ->setPort(Site::getPreference('SMTP_PORT')) |
|
| 91 | + ->setLocalDomain(Site::getPreference('SMTP_HELO')); |
|
| 92 | 92 | |
| 93 | - if (Site::getPreference('SMTP_AUTH')) { |
|
| 94 | - $transport |
|
| 95 | - ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 96 | - ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 97 | - } |
|
| 93 | + if (Site::getPreference('SMTP_AUTH')) { |
|
| 94 | + $transport |
|
| 95 | + ->setUsername(Site::getPreference('SMTP_AUTH_USER')) |
|
| 96 | + ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); |
|
| 97 | + } |
|
| 98 | 98 | |
| 99 | - if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 100 | - $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 101 | - } |
|
| 99 | + if (Site::getPreference('SMTP_SSL') !== 'none') { |
|
| 100 | + $transport->setEncryption(Site::getPreference('SMTP_SSL')); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | return $transport; |
| 104 | 104 | default: |
