diff options
Diffstat (limited to 'plugins/additional_message_headers')
3 files changed, 23 insertions, 19 deletions
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php index a43018176..0d16e605e 100644 --- a/plugins/additional_message_headers/additional_message_headers.php +++ b/plugins/additional_message_headers/additional_message_headers.php @@ -7,7 +7,7 @@ * to or remove them from outgoing messages. * * Enable the plugin in config.inc.php and add your desired headers: - * $rcmail_config['additional_message_headers'] = array('User-Agent'); + * $config['additional_message_headers'] = array('User-Agent' => 'My-Very-Own-Webmail'); * * @version @package_version@ * @author Ziba Scott @@ -15,27 +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/config.inc.php.dist b/plugins/additional_message_headers/config.inc.php.dist index 83ccd869c..72a4f1cee 100644 --- a/plugins/additional_message_headers/config.inc.php.dist +++ b/plugins/additional_message_headers/config.inc.php.dist @@ -1,14 +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']; +// $config['additional_message_headers']['X-Remote-Browser'] = $_SERVER['HTTP_USER_AGENT']; +// $config['additional_message_headers']['X-Originating-IP'] = $_SERVER['REMOTE_ADDR']; +// $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'] . ')'; +// $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; +// $config['additional_message_headers']['X-Sender'] = null; ?> 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> |