diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 90fdf9c1c..921a8275b 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -64,6 +64,8 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) "; } + + if($privmail) $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n"; else diff --git a/include/notifier.php b/include/notifier.php index 5de6eafd1..842e11080 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -106,7 +106,8 @@ function notifier_run($argv, $argc){ $top_level = true; } - $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` + $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, + `user`.`page-flags`, `user`.`prvnets` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) @@ -329,7 +330,8 @@ function notifier_run($argv, $argc){ } break; case 'stat': - + if($owner['prvnets']) + break; if($followup && $contact['notify']) { logger('notifier: slapdelivery: ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$slap); @@ -373,6 +375,7 @@ function notifier_run($argv, $argc){ } } break; + case 'mail': // WARNING: does not currently convert to RFC2047 header encodings, etc. @@ -447,9 +450,9 @@ function notifier_run($argv, $argc){ mail($addr, $subject, $message, $headers); } break; - case 'dspr': case 'feed': case 'face': + case 'dspr': default: break; } |