From b2d4cfa89a9d498f98b5d19ac496cf9f70f92070 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 09 Feb 2016 03:10:32 -0500
Subject: [PATCH] Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#1490657)
---
plugins/additional_message_headers/additional_message_headers.php | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 9247138..58e4d41 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -3,38 +3,34 @@
/**
* Additional Message Headers
*
- * Very simple plugin which will read additional headers for outgoing messages from the config file.
+ * Very simple plugin which will add additional headers
+ * to or remove them from outgoing messages.
*
- * Enable the plugin in config/main.inc.php and add your desired headers.
+ * Enable the plugin in config.inc.php and add your desired headers:
+ * $config['additional_message_headers'] = array('User-Agent' => 'My-Very-Own-Webmail');
*
- * @version 1.0
+ * @version @package_version@
* @author Ziba Scott
* @website http://roundcube.net
- *
- * Example:
- *
- * $rcmail_config['additional_message_headers']['X-Remote-Browser'] = $_SERVER['HTTP_USER_AGENT'];
- * $rcmail_config['additional_message_headers']['X-Originating-IP'] = $_SERVER['REMOTE_ADDR'];
- * $rcmail_config['additional_message_headers']['X-RoundCube-Server'] = $_SERVER['SERVER_ADDR'];
- * if( isset( $_SERVER['MACHINE_NAME'] )) {
- * $rcmail_config['additional_message_headers']['X-RoundCube-Server'] .= ' (' . $_SERVER['MACHINE_NAME'] . ')';
- * }
*/
class additional_message_headers extends rcube_plugin
{
- public $task = 'mail';
-
function init()
{
- $this->add_hook('outgoing_message_headers', array($this, 'message_headers'));
+ $this->add_hook('message_before_send', array($this, 'message_headers'));
}
- function message_headers($args){
+ function message_headers($args)
+ {
+ $this->load_config();
+
+ $rcube = rcube::get_instance();
// additional email headers
- $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
- foreach($additional_headers as $header=>$value){
- $args['headers'][$header] = $value;
+ $additional_headers = $rcube->config->get('additional_message_headers', array());
+
+ if (!empty($additional_headers)) {
+ $args['message']->headers($additional_headers, true);
}
return $args;
--
Gitblit v1.9.1