diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-07 20:03:58 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-07 20:03:58 +0200 |
| commit | e036434b8a2dbd8594c0ac5ac7233f4700e4e475 (patch) | |
| tree | 0d37048ec06d603e45fd9852f208478a89e84476 /include/notifier.php | |
| parent | 0e8b2092a0c30a8eb898a8f0e7130251300e8d47 (diff) | |
| parent | c1b2e90e3720961c280f6378e48fda7bad7c3ad0 (diff) | |
| download | volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.gz volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.bz2 volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php index db2542849..98e38fb11 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -27,6 +27,8 @@ function notifier_run($argv, $argc){ $a->set_baseurl(get_config('system','url')); + $prv = get_config('system','strict_privacy'); + logger('notifier: invoked: ' . print_r($argv,true)); $cmd = $argv[1]; @@ -329,6 +331,10 @@ function notifier_run($argv, $argc){ } break; case 'stat': + + if($prv) + break; + if($followup && $contact['notify']) { logger('notifier: slapdelivery: ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$slap); @@ -373,7 +379,7 @@ function notifier_run($argv, $argc){ } break; case 'mail': - + // WARNING: does not currently convert to RFC2047 header encodings, etc. $addr = $contact['addr']; @@ -459,7 +465,7 @@ function notifier_run($argv, $argc){ if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) { foreach($url_recipients as $url) { - if($url) { + if($url && (! $prv)) { logger('notifier: urldelivery: ' . $url); $deliver_status = slapper($owner,$url,$slap); // TODO: redeliver/queue these items on failure, though there is no contact record |