Merge pull request #3397 from tobiasd/20170427-robots

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 15523e637a83da8d1c3e3c1e0d62385ef04317b9..2ba1958a25050cbce35e075d04d6081aa5d71907 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,19 +14,19 @@ 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) {
+
+function pubsub_init(App $a) {
 
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
@@ -48,7 +47,7 @@ function pubsub_init(&$a) {
                $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                        dbesc($nick)
                );
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        logger('pubsub: local account not found: ' . $nick);
                        hub_return(false, '');
                }
@@ -63,7 +62,7 @@ function pubsub_init(&$a) {
                        intval($contact_id),
                        intval($owner['uid'])
                );
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        logger('pubsub: contact '.$contact_id.' not found.');
                        hub_return(false, '');
                }
@@ -96,12 +95,10 @@ function pubsub_init(&$a) {
                hub_return(true, $hub_challenge);
        }
 }
-}
 
 require_once('include/security.php');
 
-if(! function_exists('pubsub_post')) {
-function pubsub_post(&$a) {
+function pubsub_post(App $a) {
 
        $xml = file_get_contents('php://input');
 
@@ -120,13 +117,14 @@ function pubsub_post(&$a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
-       if(! count($r))
+       if (! dbm::is_result($r)) {
                hub_post_return();
+       }
 
        $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),
@@ -134,7 +132,7 @@ function pubsub_post(&$a) {
                dbesc(NETWORK_FEED)
        );
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
                hub_post_return();
        }
@@ -158,5 +156,8 @@ function pubsub_post(&$a) {
        consume_feed($xml,$importer,$contact,$feedhub,1,2);
 
        hub_post_return();
+
 }
-}
+
+
+