diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2012-10-23 21:26:12 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2012-10-23 21:26:12 +1100 |
| commit | 7acba41dc67e85fe889f7213c9ba0ba158983f81 (patch) | |
| tree | 08ab0d31599b17a58914a351da71c651937e7f71 /include/notifier.php | |
| parent | 672da80282d4a99adb12fc09bde89af656f0b13b (diff) | |
| download | volse-hubzilla-7acba41dc67e85fe889f7213c9ba0ba158983f81.tar.gz volse-hubzilla-7acba41dc67e85fe889f7213c9ba0ba158983f81.tar.bz2 volse-hubzilla-7acba41dc67e85fe889f7213c9ba0ba158983f81.zip | |
more cleanup
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/include/notifier.php b/include/notifier.php index 15ab67b7b..e997861f3 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -449,8 +449,6 @@ function notifier_run($argv, $argc){ ); - require_once('include/salmon.php'); - $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); // delivery loop @@ -583,39 +581,6 @@ function notifier_run($argv, $argc){ add_to_queue($contact['id'],NETWORK_DFRN,$atom); } break; - case NETWORK_OSTATUS: - - if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) - break; - - if($followup && $contact['notify']) { - logger('notifier: slapdelivery: ' . $contact['name']); - $deliver_status = slapper($owner,$contact['notify'],$slap); - - if($deliver_status == (-1)) { - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_OSTATUS,$slap); - } - } - else { - - // only send salmon if public - e.g. if it's ok to notify - // a public hub, it's ok to send a salmon - - if((count($slaps)) && ($public_message) && (! $expire)) { - logger('notifier: slapdelivery: ' . $contact['name']); - foreach($slaps as $slappy) { - if($contact['notify']) { - $deliver_status = slapper($owner,$contact['notify'],$slappy); - if($deliver_status == (-1)) { - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy); - } - } - } - } - } - break; default: break; @@ -623,20 +588,6 @@ function notifier_run($argv, $argc){ } } - // send additional slaps to mentioned remote tags (@foo@example.com) - - if($slap && count($url_recipients) && ($followup || $top_level) && $public_message && (! $expire)) { - if(! get_config('system','dfrn_only')) { - foreach($url_recipients as $url) { - if($url) { - logger('notifier: urldelivery: ' . $url); - $deliver_status = slapper($owner,$url,$slap); - // TODO: redeliver/queue these items on failure, though there is no contact record - } - } - } - } - if($public_message) { |