Fix so additional headers are added to all messages sent (#1489284)

Aleksander Machniak

2013-08-25 70eac89a5c17d665fa94156fd215e171906428b0

Fix so additional headers are added to all messages sent (#1489284)

Conflicts:

	plugins/additional_message_headers/additional_message_headers.php
	program/lib/Roundcube/rcube.php

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix so additional headers are added to all messages sent (#1489284)
- Fix display issue after moving folder in Folder Manager (#1489293)
- Fix handling of non-default date formats (#1489294)
- Fix unquoted path in PREG expression on Windows (#1489290)

 plugins/additional_message_headers/additional_message_headers.php

@@ -15,29 +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;
    }
}

?>

 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>

 program/include/rcmail.php

@@ -958,6 +958,10 @@
            'options' => $options,
        ));

        if ($plugin['abort']) {
            return isset($plugin['result']) ? $plugin['result'] : false;
        }

        $from    = $plugin['from'];
        $mailto  = $plugin['mailto'];
        $options = $plugin['options'];

 program/lib/Roundcube/rcube.php

@@ -1295,6 +1295,7 @@
            return $_SESSION['language'];
        }
    }

}



 program/steps/mail/sendmail.inc

@@ -462,6 +462,7 @@
}

// exec hook for header checking and manipulation
// Depracated: use message_before_send hook instead
$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));

// sending aborted by plugin