diff options
| author | Frederic Guillot <fred@kanboard.net> | 2017-01-05 20:45:33 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2017-01-05 20:45:33 -0500 |
| commit | febb9ade5bc6f4f11f98bc029ffe325fa6717f8f (patch) | |
| tree | d8de4bcd55624e8ebc63aff80c61fe7bd44d1ac5 /app | |
| parent | f2a24fb3bf2a246de1fc97d1673e8b8908c5b38e (diff) | |
Update Swiftmailer to avoid potential security risk
Diffstat (limited to 'app')
| -rw-r--r-- | app/Core/Mail/Transport/Mail.php | 4 | ||||
| -rw-r--r-- | app/Core/Mail/Transport/Smtp.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Core/Mail/Transport/Mail.php b/app/Core/Mail/Transport/Mail.php index d27925f0..c99cc8ba 100644 --- a/app/Core/Mail/Transport/Mail.php +++ b/app/Core/Mail/Transport/Mail.php @@ -33,8 +33,8 @@ class Mail extends Base implements ClientInterface $message = Swift_Message::newInstance() ->setSubject($subject) ->setFrom(array($this->helper->mail->getMailSenderAddress() => $author)) - ->setBody($html, 'text/html') - ->setTo(array($email => $name)); + ->setTo(array($email => $name)) + ->setBody($html, 'text/html'); Swift_Mailer::newInstance($this->getTransport())->send($message); } catch (Swift_TransportException $e) { diff --git a/app/Core/Mail/Transport/Smtp.php b/app/Core/Mail/Transport/Smtp.php index 1f4e54ce..815dde5d 100644 --- a/app/Core/Mail/Transport/Smtp.php +++ b/app/Core/Mail/Transport/Smtp.php @@ -24,6 +24,7 @@ class Smtp extends Mail $transport->setUsername(MAIL_SMTP_USERNAME); $transport->setPassword(MAIL_SMTP_PASSWORD); $transport->setEncryption(MAIL_SMTP_ENCRYPTION); + if (HTTP_VERIFY_SSL_CERTIFICATE === false) { $transport->setStreamOptions(array( 'ssl' => array( |