Only add zen-mode text labels in compose step

Thomas Bruederli

2014-08-18 3ebac0167bf20104fb7a2a55934765117760264c

 plugins/additional_message_headers/additional_message_headers.php

@@ -3,40 +3,44 @@
/**
 * 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.inc.php and add your desired headers:
 * $config['additional_message_headers'] = array('User-Agent' => 'My-Very-Own-Webmail');
 *
 * @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_before_send', array($this, 'message_headers'));
    }

    function message_headers($args){
    function message_headers($args)
    {
        $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){
            $args['headers'][$header] = $value;
        $additional_headers = $rcube->config->get('additional_message_headers', array());
        foreach ((array)$additional_headers as $header => $value) {
            if (null === $value) {
                unset($headers[$header]);
            }
            else {
                $headers[$header] = $value;
            }
        }

        $args['message']->_headers = array();
        $args['message']->headers($headers);

        return $args;
    }
}