Changeset 3292 in subversion for trunk/roundcubemail/program/steps/mail/sendmail.inc

Timestamp:

Feb 25, 2010 3:29:47 PM (3 years ago)

Author:

alec

Message:

• improve transfer encoding choosing

File:

• trunk/roundcubemail/program/steps/mail/sendmail.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -416 +416 @@
 }
 
-// chose transfer encoding
-$charset_7bit = array('ASCII', 'ISO-2022-JP', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-15');
-$transfer_encoding = in_array(strtoupper($message_charset), $charset_7bit) ? '7bit' : '8bit';
-
 // add stored attachments, if any
 if (is_array($_SESSION['compose']['attachments']))
@@ -447 +443 @@
         $attachment['name'],
         ($attachment['data'] ? false : true),
-        ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
+        // @TODO: quoted-printable for message/rfc822 is safe,
+        // but we should check that 7bit or 8bit is possible here
+        ($ctype == 'message/rfc822' ? 'quoted-printable' : 'base64'),
         ($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
         $message_charset, '', '', 
@@ -456 +454 @@
   }
 }
+
+// choose transfer encoding for plain/text body
+if (preg_match('/[^\x00-\x7F]/', $MAIL_MIME->getTXTBody()))
+  $transfer_encoding = '8bit';
+else
+  $transfer_encoding = '7bit';
 
 // encoding settings for mail composing