Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 2b0b685

Browse files
committed
Add a MAIL_ENCODING parameter in the phpmailer plugin to eventually switch to 7bit for old Exchange+Outlook configs.
(cherry picked from commit 98eebeb)
1 parent 268428b commit 2b0b685

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

core/src/plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function sendMailImpl($recipients, $subject, $body, $from = null, $ima
5858
$mail->WordWrap = 50; // set word wrap to 50 characters
5959
$mail->IsHTML(true); // set email format to HTML
6060
$mail->CharSet = "utf-8";
61-
$mail->Encoding = "quoted-printable";
61+
$mail->Encoding = $this->getFilteredOption("MAIL_ENCODING");
6262
foreach ($images as $image) {
6363
$mail->AddEmbeddedImage($image["path"], $image["cid"], '', 'base64', 'image/png');
6464
}

core/src/plugins/mailer.phpmailer-lite/manifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<server_settings>
55
<param name="MAILER" type="select" choices="sendmail|sendmail,mail|mail" label="CONF_MESSAGE[Mailer]" description="CONF_MESSAGE[Php mailer to use (see phpmail-lite documentation).]" mandatory="true" default="sendmail"/>
66
<param name="SENDMAIL_PATH" type="string" label="CONF_MESSAGE[Sendmail Path]" description="CONF_MESSAGE[Path to sendmail if not the default one]" mandatory="true" default="/usr/sbin/sendmail"/>
7+
<param name="MAIL_ENCODING" type="select" choices="quoted-printable,8bit,7bit,binary,base64" label="CONF_MESSAGE[Mails Encoding]" description="CONF_MESSAGE[Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit.]" default="quoted-printable"/>
78
</server_settings>
89
<class_definition filename="plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php" classname="PhpMailLiteMailer"/>
910
<client_settings>

0 commit comments

Comments
 (0)