1 --- dokuwiki-2012-07-08/inc/common.php~ 2012-07-08 11:24:16.000000000 +0300
2 +++ dokuwiki-2012-07-08/inc/common.php 2012-07-08 11:25:44.509886848 +0300
9 + * Returns notify address for page $id
11 + * @param string $id The changed page
12 + * @param mixed $notify The address (string) or rules where to notify
14 + * @author Elan Ruusamäe <glen@delfi.ee>
16 +function notifyNS($id, $notify) {
17 + if (empty($notify)) {
21 + if (is_string($notify)) {
25 + // process $notify for pages
26 + foreach ($notify as $rule => $address) {
27 + if (preg_match('/'.$rule.'/ui',':'.$id)) {
36 * Sends a notify mail on page change
38 @@ -1137,10 +1137,10 @@
40 // decide if there is something to do, eg. whom to mail
42 - if(empty($conf['notify'])) return false; //notify enabled?
43 if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
44 + $to = notifyNS($id, $conf['notify']);
45 + if(empty($to)) return; //notify enabled?
46 $text = rawLocale('mailtext');
47 - $to = $conf['notify'];
49 } elseif($who == 'subscribers') {
50 if(!$conf['subscribers']) return false; //subscribers enabled?
53 $text = rawLocale('subscr_single');
54 } elseif($who == 'register') {
55 - if(empty($conf['registernotify'])) return false;
56 + $to = notifyNS($id, $conf['registernotify']);
57 + if(empty($to)) return;
58 $text = rawLocale('registermail');
59 - $to = $conf['registernotify'];
62 return false; //just to be safe
63 --- dokuwiki-2012-07-19/inc/media.php~ 2012-07-15 23:56:17.000000000 +0300
64 +++ dokuwiki-2012-07-19/inc/media.php 2012-07-30 17:02:13.070873955 +0300
69 + $to = notifyNS($id, $conf['notify']);
71 - $mail->to($conf['notify']);
73 $mail->subject($lang['mail_upload'].' '.$id);
74 $mail->setBody($text,$trep);
76 --- dokuwiki/./inc/subscription.php~ 2012-07-29 13:25:32.000000000 +0300
77 +++ dokuwiki/./inc/subscription.php 2012-07-30 18:02:34.710521495 +0300
79 if ($info === false) continue;
80 $level = auth_aclcheck($id, $sub[0], $info['grps']);
81 if ($level >= AUTH_READ) {
82 - if (strcasecmp($info['mail'], $conf['notify']) != 0) {
83 + $notify = notifyNS($id, $conf['notify']);
84 + if (strcasecmp($info['mail'], $notify) != 0) {
85 $emails[$sub[0]] = $info['mail'];