Copy plugins to release branch

3 files changed, 104 insertions, 0 deletions

diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
new file mode 100644
index 000000000..80c58d58b
--- /dev/null
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Additional Message Headers
+ *
+ * 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:
+ * $rcmail_config['additional_message_headers'] = array('User-Agent');
+ *
+ * @version @package_version@
+ * @author Ziba Scott
+ * @website http://roundcube.net
+ */
+class additional_message_headers extends rcube_plugin
+{
+    public $task = 'mail';
+
+    function init()
+    {
+        $this->add_hook('message_outgoing_headers', array($this, 'message_headers'));
+    }
+
+    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){
+            if (null === $value) {
+                unset($args['headers'][$header]);
+            } else {
+                $args['headers'][$header] = $value;
+            }
+        }
+
+        return $args;
+    }
+}
+
+?>
diff --git a/plugins/additional_message_headers/config.inc.php.dist b/plugins/additional_message_headers/config.inc.php.dist
new file mode 100644
index 000000000..83ccd869c
--- /dev/null
+++ b/plugins/additional_message_headers/config.inc.php.dist
@@ -0,0 +1,14 @@
+<?php
+
+// $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'] . ')';
+// }
+
+// To remove (e.g. X-Sender) message header use null value
+// $rcmail_config['additional_message_headers']['X-Sender'] = null;
+
+?>
diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml
new file mode 100644
index 000000000..d79dbaef1
--- /dev/null
+++ b/plugins/additional_message_headers/package.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+    http://pear.php.net/dtd/tasks-1.0.xsd
+    http://pear.php.net/dtd/package-2.0
+    http://pear.php.net/dtd/package-2.0.xsd">
+ <name>additional_message_headers</name>
+ <channel>pear.roundcube.net</channel>
+ <summary>Additional message headers for Roundcube</summary>
+ <description>Very simple plugin which will add additional headers to or remove them from outgoing messages.</description>
+ <lead>
+  <name>Ziba Scott</name>
+  <user>ziba</user>
+  <email>email@example.org</email>
+  <active>yes</active>
+ </lead>
+ <date>2010-01-16</date>
+ <time>18:19:33</time>
+ <version>
+  <release>1.1.0</release>
+  <api>1.1.0</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPL v2</license>
+ <notes>-</notes>
+ <contents>
+  <dir baseinstalldir="/" name="/">
+   <file name="additional_message_headers.php" role="php">
+    <tasks:replace from="@name@" to="name" type="package-info" />
+    <tasks:replace from="@package_version@" to="version" type="package-info" />
+   </file>
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.2.1</min>
+   </php>
+   <pearinstaller>
+    <min>1.7.0</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <phprelease />
+</package>