From 2a21fecd79ab100984b8667f4f92a8ac8dc6f463 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 20 Mar 2014 18:46:01 +0100 Subject: [PATCH] Only some code beautification. No functional changes. --- include/delivery.php | 3 +-- include/notifier.php | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/delivery.php b/include/delivery.php index 97f3933116..a3d4838b0e 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -366,7 +366,6 @@ function delivery_run(&$argv, &$argc){ break; case NETWORK_OSTATUS : - // Do not send to otatus if we are not configured to send to public networks if($owner['prvnets']) break; @@ -386,7 +385,7 @@ function delivery_run(&$argv, &$argc){ // private emails may be in included in public conversations. Filter them. if(($public_message) && $item['private'] == 1) continue; - + $item_contact = get_item_contact($item,$icontacts); if(! $item_contact) continue; diff --git a/include/notifier.php b/include/notifier.php index ea2f5e75c4..203b740538 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -696,6 +696,7 @@ function notifier_run(&$argv, &$argc){ // Do not send to ostatus if we are not configured to send to public networks if($owner['prvnets']) break; + if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) break; @@ -707,8 +708,7 @@ function notifier_run(&$argv, &$argc){ // queue message for redelivery add_to_queue($contact['id'],NETWORK_OSTATUS,$slap); } - } - else { + } else { // only send salmon if public - e.g. if it's ok to notify // a public hub, it's ok to send a salmon @@ -847,7 +847,7 @@ function notifier_run(&$argv, &$argc){ if(! $contact['pubkey']) break; - + if($target_item['verb'] === ACTIVITY_DISLIKE) { // unsupported break; @@ -906,14 +906,14 @@ function notifier_run(&$argv, &$argc){ if($public_message) { - $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' + $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ", dbesc(NETWORK_DIASPORA), intval($owner['uid']), intval(CONTACT_IS_SHARING) ); - - $r2 = q("SELECT `id`, `name`,`network` FROM `contact` + + $r2 = q("SELECT `id`, `name`,`network` FROM `contact` WHERE `network` in ( '%s', '%s') AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `rel` != %d order by rand() ", dbesc(NETWORK_DFRN),