Only some code beautification. No functional changes.

diff --git a/include/delivery.php b/include/delivery.php
index 97f39331161c04d6581596d65f226f4933ba199c..a3d4838b0ea87da4aac1e426da781c196560a195 100644 (file)
--- 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 ea2f5e75c457b3f8e54d99718fc8462621d1f284..203b7405389f9e36797f1599c91ea32560ff2b07 100644 (file)
--- 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),