* fixing mimetype issue from #1484062

till

2008-02-13 75f0a738891b88650bb4f22de5b5e5346bb0b668

 program/steps/mail/sendmail.inc

@@ -206,11 +206,12 @@
// additional headers
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;
$headers['Received'] = 'from '.
$headers['Received'] =  wordwrap('from ' .
  (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
   gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR']."]\r\n\tvia " : '').
  gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR']."]\r\n\t with ".
  $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); '.date('r');
    gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].'] via ' : '') .
  gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].'] with ' .
  $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
  69, rcmail_header_delm() . "\t");

if (!empty($CONFIG['useragent']))
  $headers['User-Agent'] = $CONFIG['useragent'];
@@ -238,7 +239,7 @@
  // add a plain text version of the e-mail as an alternative part.
  $h2t = new html2text($message_body);
  $plainTextPart = wordwrap($h2t->get_text(), 998, "\r\n", true);
  $MAIL_MIME->setTXTBody($plainTextPart);
  $MAIL_MIME->setTXTBody(html_entity_decode($plainTextPart, ENT_COMPAT, 'utf-8'));

  // look for "emoticon" images from TinyMCE and copy into message as attachments
  rcmail_attach_emoticons($MAIL_MIME);
@@ -265,7 +266,11 @@
    }
    else
    {
      $MAIL_MIME->addAttachment($attachment['path'], $attachment['mimetype'], $attachment['name'], true, 'base64', 'attachment', $message_charset);
      /*
        We need to replace mime_content_type in a later release because the function
        is deprecated in favour of File_Info
      */
      $MAIL_MIME->addAttachment($attachment['path'], mime_content_type($attachment['path']), $attachment['name'], true, 'base64', 'attachment', $message_charset);
    }
  }