Warnings removed

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 15523e637a83da8d1c3e3c1e0d62385ef04317b9..6053ee2fbe1553e60d1fa182aff303fbd8e1dad0 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,6 +1,5 @@
 <?php
 
-if(! function_exists('hub_return')) {
 function hub_return($valid,$body) {
 
        if($valid) {
@@ -15,18 +14,18 @@ function hub_return($valid,$body) {
 
        // NOTREACHED
 }
-}
 
 // when receiving an XML feed, always return OK
-if(! function_exists('hub_post_return')) {
+
 function hub_post_return() {
+
        header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
        killme();
+
 }
-}
 
 
-if(! function_exists('pubsub_init')) {
+
 function pubsub_init(&$a) {
 
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
@@ -58,7 +57,7 @@ function pubsub_init(&$a) {
 
                $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d 
                        AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
                        intval($contact_id),
                        intval($owner['uid'])
@@ -76,7 +75,7 @@ function pubsub_init(&$a) {
 
                $contact = $r[0];
 
-               // We must initiate an unsubscribe request with a verify_token.
+               // We must initiate an unsubscribe request with a verify_token. 
                // Don't allow outsiders to unsubscribe us.
 
                if($hub_mode === 'unsubscribe') {
@@ -96,11 +95,9 @@ function pubsub_init(&$a) {
                hub_return(true, $hub_challenge);
        }
 }
-}
 
 require_once('include/security.php');
 
-if(! function_exists('pubsub_post')) {
 function pubsub_post(&$a) {
 
        $xml = file_get_contents('php://input');
@@ -125,8 +122,8 @@ function pubsub_post(&$a) {
 
        $importer = $r[0];
 
-       $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d
-               AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+       $r = q("SELECT * FROM `contact` WHERE `subhub` AND `id` = %d AND `uid` = %d
+               AND (`rel` = %d OR `rel` = %d OR network = '%s') AND NOT `blocked` LIMIT 1",
                intval($contact_id),
                intval($importer['uid']),
                intval(CONTACT_IS_SHARING),
@@ -158,5 +155,8 @@ function pubsub_post(&$a) {
        consume_feed($xml,$importer,$contact,$feedhub,1,2);
 
        hub_post_return();
+
 }
-}
+
+
+