- additional_message_headers: allow unsetting headers, support plugin's con...

alecpl

2009-11-19 469f84fa49d6ddb22f1eb82d9f0d5aec97af60d8

- additional_message_headers: allow unsetting headers, support plugin's config file (#1486268)

 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)

 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;
    }
}

?>