Bring back additional_message_headers compatibility with Mail_Mime < 1.9

Aleksander Machniak

2016-02-09 efe06f2b12b6483d7255c6e4f748a436d8faeb47

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
<?php
 
/**
 * Additional Message Headers
 *
 * Very simple plugin which will add additional headers
 * to or remove them from outgoing messages.
 *
 * Enable the plugin in config.inc.php and add your desired headers:
 * $config['additional_message_headers'] = array('User-Agent' => 'My-Very-Own-Webmail');
 *
 * @version @package_version@
 * @author Ziba Scott
 * @website http://roundcube.net
 */
class additional_message_headers extends rcube_plugin
{
    function init()
    {
        $this->add_hook('message_before_send', array($this, 'message_headers'));
    }
 
    function message_headers($args)
    {
        $this->load_config();
 
        $rcube = rcube::get_instance();
 
        // additional email headers
        $additional_headers = $rcube->config->get('additional_message_headers', array());
 
        if (!empty($additional_headers)) {
            // Mail_mime >= 1.9.0
            if (method_exists($message, 'isMultipart')) {
                $args['message']->headers($additional_headers, true);
            }
            else {
                $headers = $args['message']->headers();
 
                foreach ((array) $additional_headers as $header => $value) {
                    if ($value === null) {
                        unset($headers[$header]);
                    }
                    else {
                        $headers[$header] = $value;
                    }
                }
 
                $args['message']->_headers = array();
                $args['message']->headers($headers);
            }
        }
 
        return $args;
    }
}