From 469f84fa49d6ddb22f1eb82d9f0d5aec97af60d8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 19 Nov 2009 14:42:27 -0500
Subject: [PATCH] - additional_message_headers: allow unsetting headers, support plugin's config file (#1486268)
---
CHANGELOG | 1 +
plugins/additional_message_headers/additional_message_headers.php | 27 +++++++++++++--------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2bfc11f..03d1bdb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- additional_message_headers: allow unsetting headers, support plugin's config file (#1486268)
- Fix displaying of hidden directories in skins list (#1486301)
- Fix open_basedir restriction error when reading skins list (#1486304)
- Fix pasting from Office apps into html editor (#1486271)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 9247138..757296a 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -3,22 +3,13 @@
/**
* 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.
- *
- * @version 1.0
+ * @version 1.1
* @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'] . ')';
- * }
+ * See config.inc.php.disc
*/
class additional_message_headers extends rcube_plugin
{
@@ -29,14 +20,22 @@
$this->add_hook('outgoing_message_headers', array($this, 'message_headers'));
}
- function message_headers($args){
+ function message_headers($args)
+ {
+ $this->load_config();
// additional email headers
$additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
foreach($additional_headers as $header=>$value){
- $args['headers'][$header] = $value;
+ if (null === $value) {
+ unset($args['headers'][$header]);
+ } else {
+ $args['headers'][$header] = $value;
+ }
}
return $args;
}
}
+
+?>
--
Gitblit v1.9.1