Imported Upstream version 0.5

[roundcube.git] / plugins / additional_message_headers / additional_message_headers.php

diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 92471384e63e4495664a852bc195c9d47b13131c..80c58d58b3cbee7ab0748d5d0a9a3d9334585378 100644 (file)
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -3,40 +3,41 @@
 /**
  * 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/main.inc.php and add your desired headers:
+ * $rcmail_config['additional_message_headers'] = array('User-Agent');
  *
- * @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_outgoing_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;
     }
 }
+
+?>