diff options
| author | alecpl <alec@alec.pl> | 2008-09-29 07:38:16 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2008-09-29 07:38:16 +0000 |
| commit | ffae15e5fcde50cf8c1b168fa313f4ec3454a693 (patch) | |
| tree | 88f81d19eb5ebc41710fb9a161b054881ba5e3bd /program/steps/mail/sendmail.inc | |
| parent | 29e697b24a68d7fca600f88ebc913b3ba5240f50 (diff) | |
- Added 'mime_param_folding' option with possibility to choose
long/non-ascii attachment names encoding eg. to be readable
in MS Outlook/OE (#1485320)
- Added "advanced options" feature in User Preferences
Diffstat (limited to 'program/steps/mail/sendmail.inc')
| -rw-r--r-- | program/steps/mail/sendmail.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 543895dec..d342124a4 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -304,7 +304,10 @@ if (is_array($_SESSION['compose']['attachments'])) $attachment['name'], true, ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'), ($ctype == 'message/rfc822' ? 'inline' : 'attachment'), - $message_charset); + $message_charset, '', '', + $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, + $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL + ); } } @@ -316,8 +319,11 @@ if (is_array($_FILES['_attachments']['tmp_name'])) $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914 $MAIL_MIME->addAttachment($filepath, $ctype, $files['name'][$i], true, - ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'), - 'attachment', $message_charset); + $ctype == 'message/rfc822' ? $transfer_encoding : 'base64', + 'attachment', $message_charset, '', '', + $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, + $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL + ); } |