1 --- dokuwiki-2012-07-16/inc/common.php 2012-07-16 00:20:31.431313996 +0300
2 +++ dokuwiki-2012-07-19/inc/common.php 2012-07-19 19:13:50.094210050 +0300
6 + // add mail headers to identify page changes in same mail thread
7 + if ($conf['mailthreads'] && $who != 'register') {
9 + $cur = @filemtime($file);
11 + $server = parse_url(DOKU_URL, PHP_URL_HOST);
12 + $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server;
13 + $listid = strtolower(trim($listid, '.'));
15 + $mail->setHeader('Message-Id', "$id?rev=$cur@listid", false);
17 + $mail->setHeader('In-Reply-To', "$id?rev=$rev@listid", false);
22 --- dokuwiki/conf/dokuwiki.php~ 2012-07-19 09:02:02.000000000 +0300
23 +++ dokuwiki/conf/dokuwiki.php 2012-07-19 19:12:53.031815276 +0300
25 $conf['mailfrom'] = ''; //use this email when sending mails
26 $conf['mailprefix'] = ''; //use this as prefix of outgoing mails
27 $conf['htmlmail'] = 1; //send HTML multipart mails
28 +$conf['mailthreads'] = 1; //add threading headers to page change notification mails
30 /* Syndication Settings */
31 $conf['sitemap'] = 0; //Create a google sitemap? How often? In days.
32 --- dokuwiki/lib/plugins/config/settings/config.metadata.php~ 2012-07-15 23:56:17.000000000 +0300
33 +++ dokuwiki/lib/plugins/config/settings/config.metadata.php 2012-07-19 19:15:54.789443307 +0300
35 $meta['mailfrom'] = array('richemail');
36 $meta['mailprefix'] = array('string');
37 $meta['htmlmail'] = array('onoff');
38 +$meta['mailthreads'] = array('onoff');
40 $meta['_syndication'] = array('fieldset');
41 $meta['sitemap'] = array('numeric');
42 --- dokuwiki/lib/plugins/config/lang/en/lang.php~ 2012-07-19 19:17:16.000000000 +0300
43 +++ dokuwiki/lib/plugins/config/lang/en/lang.php 2012-07-19 19:17:19.673005805 +0300
45 $lang['mailfrom'] = 'Sender email address to use for automatic mails';
46 $lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title';
47 $lang['htmlmail'] = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.';
48 +$conf['mailthreads'] = 'Add threading headers to page change notification mails';
50 /* Syndication Settings */
51 $lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable';