summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/mail/sendmail.inc
diff options
context:
space:
mode:
authorroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2005-10-21 12:12:23 +0000
committerroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2005-10-21 12:12:23 +0000
commita859a759e8ca812a55ac36aba2e36446c17574e0 (patch)
tree4b91e5aa1cd01d69facdc1194137ac46666c3d0a /roundcubemail/program/steps/mail/sendmail.inc
parente8ee29555cd7845b3fbfcaab6f012608f80ad442 (diff)
Improved support for UTF-8 and other charsets
git-svn-id: https://svn.roundcube.net/trunk@50 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/sendmail.inc')
-rw-r--r--roundcubemail/program/steps/mail/sendmail.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 61821261d..809aed534 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -147,9 +147,16 @@ if (is_array($_FILES['_attachments']['tmp_name']))
foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
$MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], TRUE);
+// encoding settings for mail composing
+$message_param = array('text_encoding' => '7bit',
+ 'html_encoding' => 'quoted-printable',
+ 'head_encoding' => 'quoted-printable',
+ 'head_charset' => 'ISO-8859-1',
+ 'html_charset' => 'UTF-8',
+ 'text_charset' => 'UTF-8');
// compose message body and get headers
-$msg_body = $MAIL_MIME->get();
+$msg_body = $MAIL_MIME->get($message_param);
$msg_subject = $headers['Subject'];