diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-08-25 09:03:01 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-08-25 09:15:29 +0200 |
commit | 70eac89a5c17d665fa94156fd215e171906428b0 (patch) | |
tree | e01d1dd494a90ea09b41711c836f41f34b1dc339 /plugins/additional_message_headers/additional_message_headers.php | |
parent | eae2a1e6845bfad92e791075ddd1a9142832d59a (diff) |
Fix so additional headers are added to all messages sent (#1489284)
Conflicts:
plugins/additional_message_headers/additional_message_headers.php
program/lib/Roundcube/rcube.php
Diffstat (limited to 'plugins/additional_message_headers/additional_message_headers.php')
-rw-r--r-- | plugins/additional_message_headers/additional_message_headers.php | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php index 80c58d58b..43f9d0098 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; } } - -?> |