Bugfixes for encoding and sending with attachments

thomascube

2006-02-04 58e3602a37cccab55f71fbf839b32fbc4322699c

 program/steps/mail/sendmail.inc

@@ -115,7 +115,7 @@
  $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];

// add subject
$headers['Subject'] = rcube_charset_convert(trim(stripslashes($_POST['_subject'])), $input_charset, $message_charset);
$headers['Subject'] = rcube_charset_convert(trim($_POST['_subject']), $input_charset, $message_charset);

if (strlen($identity_arr['organization']))
  $headers['Organization'] = $identity_arr['organization'];
@@ -144,7 +144,7 @@
  $headers['User-Agent'] = $CONFIG['useragent'];

// fetch message body
$message_body = rcube_charset_convert(stripslashes($_POST['_message']), $input_charset, $message_charset);
$message_body = rcube_charset_convert($_POST['_message'], $input_charset, $message_charset);

// append generic footer to all messages
if (!empty($CONFIG['generic_message_footer']))
@@ -225,7 +225,7 @@
else
  {
  // unset some headers because they will be added by the mail() function
  $headers_php = $headers;
  $headers_php = $MAIL_MIME->_headers;
  $headers_enc = $MAIL_MIME->headers($headers);
  unset($headers_php['To'], $headers_php['Subject']);