1 --- dokuwiki-2013-05-10/inc/common.php~ 2013-05-28 22:43:32.565530521 +0300
2 +++ dokuwiki-2013-05-10/inc/common.php 2013-05-28 22:47:27.455072897 +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 @@ -1162,10 +1162,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
45 - $to = $conf['notify'];
46 + $to = notifyNS($id, $conf['notify']);
47 + if(empty($to)) return; //notify enabled?
48 } elseif($who == 'subscribers') {
49 if(!actionOK('subscribe')) return false; //subscribers enabled?
50 if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return false; //skip minors
51 --- dokuwiki-2014-05-06/inc/media.php~ 2014-05-06 15:09:52.000000000 +0300
52 +++ dokuwiki-2014-05-06/inc/media.php 2014-05-08 11:24:16.977561680 +0300
55 function media_notify($id,$file,$mime,$old_rev=false){
57 - if(empty($conf['notify'])) return false; //notify enabled?
58 + $to = notifyNS($id, $conf['notify']);
59 + if(empty($to)) return false; //notify enabled?
61 $subscription = new Subscription();
62 - return $subscription->send_media_diff($conf['notify'], 'uploadmail', $id, $old_rev);
63 + return $subscription->send_media_diff($to, 'uploadmail', $id, $old_rev);
67 --- dokuwiki-2013-05-10/inc/subscription.php~ 2013-05-10 15:45:54.000000000 +0300
68 +++ dokuwiki-2013-05-10/inc/subscription.php 2013-05-28 22:50:30.872112776 +0300
71 public function send_register($login, $fullname, $email) {
73 - if(empty($conf['registernotify'])) return false;
74 + $to = notifyNS($id, $conf['registernotify']);
75 + if(empty($to)) return false;
83 - $conf['registernotify'],
90 $level = auth_aclcheck($id, $user, $userinfo['grps']);
91 if($level >= AUTH_READ) {
92 - if(strcasecmp($userinfo['mail'], $conf['notify']) != 0) { //skip user who get notified elsewhere
93 + $to = notifyNS($id, $conf['notify']);
94 + if(strcasecmp($userinfo['mail'], $to) != 0) { //skip user who get notified elsewhere
95 $result[$user] = $userinfo['mail'];