From 70eac89a5c17d665fa94156fd215e171906428b0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 25 Aug 2013 03:15:29 -0400
Subject: [PATCH] Fix so additional headers are added to all messages sent (#1489284)
---
program/lib/Roundcube/rcube.php | 1 +
CHANGELOG | 1 +
plugins/additional_message_headers/package.xml | 7 +++----
program/include/rcmail.php | 4 ++++
program/steps/mail/sendmail.inc | 1 +
plugins/additional_message_headers/additional_message_headers.php | 25 ++++++++++++++-----------
6 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index cd847e6..acd543d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix so additional headers are added to all messages sent (#1489284)
- Fix display issue after moving folder in Folder Manager (#1489293)
- Fix handling of non-default date formats (#1489294)
- Fix unquoted path in PREG expression on Windows (#1489290)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 80c58d5..43f9d00 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -15,29 +15,32 @@
*/
class additional_message_headers extends rcube_plugin
{
- public $task = 'mail';
-
function init()
{
- $this->add_hook('message_outgoing_headers', array($this, 'message_headers'));
+ $this->add_hook('message_before_send', array($this, 'message_headers'));
}
function message_headers($args)
{
- $this->load_config();
+ $this->load_config();
+
+ $headers = $args['message']->headers();
+ $rcube = rcube::get_instance();
// additional email headers
- $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
- foreach($additional_headers as $header=>$value){
+ $additional_headers = $rcube->config->get('additional_message_headers', array());
+ foreach ((array)$additional_headers as $header => $value) {
if (null === $value) {
- unset($args['headers'][$header]);
- } else {
- $args['headers'][$header] = $value;
+ unset($headers[$header]);
+ }
+ else {
+ $headers[$header] = $value;
}
}
+
+ $args['message']->_headers = array();
+ $args['message']->headers($headers);
return $args;
}
}
-
-?>
diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml
index 73c24fb..c15d9f8 100644
--- a/plugins/additional_message_headers/package.xml
+++ b/plugins/additional_message_headers/package.xml
@@ -13,11 +13,10 @@
<email>email@example.org</email>
<active>yes</active>
</lead>
- <date>2010-01-16</date>
- <time>18:19:33</time>
+ <date>2013-08-25</date>
<version>
- <release>1.1.0</release>
- <api>1.1.0</api>
+ <release>1.2.0</release>
+ <api>1.2.0</api>
</version>
<stability>
<release>stable</release>
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 675a2c0..4cfaca1 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -958,6 +958,10 @@
'options' => $options,
));
+ if ($plugin['abort']) {
+ return isset($plugin['result']) ? $plugin['result'] : false;
+ }
+
$from = $plugin['from'];
$mailto = $plugin['mailto'];
$options = $plugin['options'];
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index af24b0e..d5f1d59 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1295,6 +1295,7 @@
return $_SESSION['language'];
}
}
+
}
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index cb3a405..b1f5aeb 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -462,6 +462,7 @@
}
// exec hook for header checking and manipulation
+// Depracated: use message_before_send hook instead
$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));
// sending aborted by plugin
--
Gitblit v1.9.1