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

Timestamp:

Feb 19, 2006 1:34:34 PM (7 years ago)

Author:

roundcube

Message:

Applied several patches

File:

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

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

@@ -124 +124 @@
   $headers['Reply-To'] = $identity_arr['reply-to'];
 
-if ($_SESSION['compose']['reply_msgid'])
+if (!empty($_SESSION['compose']['reply_msgid']))
   $headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
 
+if (!empty($_SESSION['compose']['references']))
+  $headers['References'] = $_SESSION['compose']['references'];
 
 if ($_POST['_priority'])
@@ -181 +183 @@
 
 
+// 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';
+
 // encoding settings for mail composing
-$message_param = array('text_encoding' => '8bit',
+$message_param = array('text_encoding' => $transfer_encoding,
                        'html_encoding' => 'quoted-printable',
                        'head_encoding' => 'quoted-printable',
@@ -191 +197 @@
 // compose message body and get headers
 $msg_body = $MAIL_MIME->get($message_param);
+
 $msg_subject = $headers['Subject'];
-
+global $MBSTRING;
+if ($MBSTRING&&function_exists( "mb_encode_mimeheader"))
+  $headers['Subject'] = mb_encode_mimeheader( $headers['Subject'],$message_charset);
 
 // send thru SMTP server using cusotm SMTP library