- Fix using mail() on Windows (#1485779)

release-0.6
alecpl 16 years ago
parent 38ddba5cda
commit 5d110184c0

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
=========================== ===========================
- Fix using mail() on Windows (#1485779)
- Fix word wrapping in message-part's <PRE>s for printing (#1485787) - Fix word wrapping in message-part's <PRE>s for printing (#1485787)
- Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714) - Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
- Fix double footer in HTML message with embedded images - Fix double footer in HTML message with embedded images

@ -1309,6 +1309,13 @@ function rcmail_deliver_message(&$message, $from, $mailto)
$message->_headers = array(); $message->_headers = array();
$header_str = $message->txtHeaders($headers_php); $header_str = $message->txtHeaders($headers_php);
// #1485779
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
$headers_enc['To'] = implode(', ', $m[1]);
}
}
if (ini_get('safe_mode')) if (ini_get('safe_mode'))
$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str); $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
else else

Loading…
Cancel
Save