diff options
| author | Friendika <info@friendika.com> | 2011-06-23 01:57:14 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-06-23 01:57:14 -0700 |
| commit | 96857389ac6a9ab11f0543da5b0af3895dfccfaf (patch) | |
| tree | 12771d50402245181c43df95e3f9c5cdedaa7c2f /include/notifier.php | |
| parent | aa4636d03a03718c5c5e58c17af40ee0104be2b6 (diff) | |
| download | volse-hubzilla-96857389ac6a9ab11f0543da5b0af3895dfccfaf.tar.gz volse-hubzilla-96857389ac6a9ab11f0543da5b0af3895dfccfaf.tar.bz2 volse-hubzilla-96857389ac6a9ab11f0543da5b0af3895dfccfaf.zip | |
friendika-z initial implementation
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 9 |
1 files changed, 6 insertions, 3 deletions
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; } |