Bump DB version

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 3d8bfca48e39a5db21e6384b2897cf5c31877530..2ba1958a25050cbce35e075d04d6081aa5d71907 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,7 +1,7 @@
 <?php
 
 function hub_return($valid,$body) {
-       
+
        if($valid) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
                echo $body;
@@ -18,7 +18,7 @@ function hub_return($valid,$body) {
 // when receiving an XML feed, always return OK
 
 function hub_post_return() {
-       
+
        header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
        killme();
 
@@ -26,7 +26,7 @@ function hub_post_return() {
 
 
 
-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 );
@@ -47,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, '');
                }
@@ -57,24 +57,25 @@ 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'])
                );
-               if(! count($r)) {
-                       logger('pubsub: contact not found.');
+               if (! dbm::is_result($r)) {
+                       logger('pubsub: contact '.$contact_id.' not found.');
                        hub_return(false, '');
                }
 
-               if(! link_compare($hub_topic,$r[0]['poll'])) {
-                       logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
-                       // should abort but let's humour them.                  
-               }
+               if ($hub_topic)
+                       if(! link_compare($hub_topic,$r[0]['poll'])) {
+                               logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
+                               // should abort but let's humour them.
+                       }
 
                $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') {
@@ -85,10 +86,11 @@ function pubsub_init(&$a) {
                        logger('pubsub: unsubscribe success');
                }
 
-               $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
-                       intval($subscribe),
-                       intval($contact['id'])
-               );
+               if ($hub_mode)
+                       $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
+                               intval($subscribe),
+                               intval($contact['id'])
+                       );
 
                hub_return(true, $hub_challenge);
        }
@@ -96,7 +98,7 @@ function pubsub_init(&$a) {
 
 require_once('include/security.php');
 
-function pubsub_post(&$a) {
+function pubsub_post(App $a) {
 
        $xml = file_get_contents('php://input');
 
@@ -115,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),
@@ -129,8 +132,8 @@ function pubsub_post(&$a) {
                dbesc(NETWORK_FEED)
        );
 
-       if(! count($r)) {
-               logger('pubsub: no contact record - ignored');
+       if (! dbm::is_result($r)) {
+               logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
                hub_post_return();
        }