From 6f249b0e38707f8cb843a3b0ad849fd8c77d6de0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 16 Aug 2015 11:47:30 -0400
Subject: [PATCH] Change code so versions of Mail_mime before and after 1.9.0 are supported
---
program/lib/Roundcube/rcube.php | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index d452ea8..4d80dc0 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1560,8 +1560,7 @@
$a_recipients[] = $headers['Bcc'];
// remove Bcc header and get the whole head of the message as string
- $send_headers = array('Bcc' => null);
- $smtp_headers = $message->txtHeaders($send_headers, true);
+ $smtp_headers = $this->message_head($message, array('Bcc'));
if ($message->getParam('delay_file_io')) {
// use common temp dir
@@ -1601,15 +1600,13 @@
}
// send mail using PHP's mail() function
else {
- // unset some headers because they will be added by the mail() function
- $headers_enc = $headers;
- $headers_res = array('To' => null, 'Subject' => null);
- $header_str = $message->txtHeaders($headers_res, true);
+ // unset To,Subject headers because they will be added by the mail() function
+ $header_str = $this->message_head($message, array('To', 'Subject'));
// #1485779
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
- if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
- $headers_enc['To'] = implode(', ', $m[1]);
+ if (preg_match_all('/<([^@]+@[^>]+)>/', $headers['To'], $m)) {
+ $headers['To'] = implode(', ', $m[1]);
}
}
@@ -1623,8 +1620,8 @@
}
else {
$delim = $this->config->header_delimiter();
- $to = $headers_enc['To'];
- $subject = $headers_enc['Subject'];
+ $to = $headers['To'];
+ $subject = $headers['Subject'];
$header_str = rtrim($header_str);
if ($delim != "\r\n") {
@@ -1681,6 +1678,28 @@
return $sent;
}
+
+ /**
+ * Return message headers as a string
+ */
+ protected function message_head($message, $unset = array())
+ {
+ // Mail_mime >= 1.9.0
+ if (method_exists($message, 'isMultipart')) {
+ foreach ($unset as $header) {
+ $headers[$header] = null;
+ }
+ }
+ else {
+ $headers = $message->headers();
+ foreach ($unset as $header) {
+ unset($headers[$header]);
+ }
+ $message->_headers = array();
+ }
+
+ return $message->txtHeaders($headers, true);
+ }
}
--
Gitblit v1.9.1