diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 4 | ||||
| -rw-r--r-- | include/notifier.php | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 9bbd6bcb4..d0952421e 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -40,7 +40,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra = ''; if($privmail || $celeb) { - $sql_extra = sprintf(" AND `rel` = %d ", intval(REL_BUD)); + $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD)); } if($privmail) @@ -49,7 +49,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n"; $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' $sql_extra ORDER BY `name` ASC ", intval(local_user()) diff --git a/include/notifier.php b/include/notifier.php index 405688ab1..f22917e4f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -257,7 +257,7 @@ $deliver_status = dfrn_deliver($owner,$contact,$atom); break; default: - if($followup) { + if($followup && $contact['notify']) { slapper($owner,$contact['notify'],$slap); } else { @@ -268,7 +268,9 @@ if(count($slaps) && $notify_hub) { logger('notifier: slapdelivery: ' . $contact['name']); foreach($slaps as $slappy) { - slapper($owner,$contact['notify'],$slappy); + if($contact['notify']) { + slapper($owner,$contact['notify'],$slappy); + } } } } @@ -289,7 +291,9 @@ foreach($url_recipients as $url) { logger('notifier: urldelivery: ' . $url); foreach($slaps as $slappy) { - slapper($owner,$url,$slappy); + if($url) { + slapper($owner,$url,$slappy); + } } } } |