diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/additional_message_headers/additional_message_headers.php | 25 | ||||
-rw-r--r-- | plugins/additional_message_headers/package.xml | 7 |
2 files changed, 17 insertions, 15 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; } } - -?> diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml index 73c24fba7..c15d9f8b3 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> |