Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 4dff5d531ab27a9450ebe2b37c6c37a7645ad0e1..64fbda289f674145f8abf216eff38f1b6dc1e56a 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,33 +44,46 @@ function pubsub_init(&$a) {
 
                $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
                        dbesc($nick)
                );
-               if(! count($r))
+               if(! count($r)) {
+                       logger('pubsub: local account not found: ' . $nick);
                        hub_return(false, '');
+               }
 
 
                $owner = $r[0];
 
                $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-               $r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `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",
-                       dbesc($hub_topic),
                        intval($contact_id),
                        intval($owner['uid'])
                );
-               if(! count($r))
+               if(! count($r)) {
+                       logger('pubsub: contact 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.                  
+               }
 
                $contact = $r[0];
 
                // We must initiate an unsubscribe request with a verify_token. 
                // Don't allow outsiders to unsubscribe us.
 
-               if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify))) 
-                       hub_return(false, '');
+               if($hub_mode === 'unsubscribe') {
+                       if(! strlen($hub_verify)) {
+                               logger('pubsub: bogus unsubscribe'); 
+                               hub_return(false, '');
+                       }
+                       logger('pubsub: unsubscribe success');
+               }
 
                $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1",
                        intval($subscribe),
@@ -99,7 +112,7 @@ function pubsub_post(&$a) {
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
                dbesc($nick)
        );
        if(! count($r))
@@ -132,11 +145,11 @@ function pubsub_post(&$a) {
 
        require_once('include/items.php');
 
-       consume_feed($xml,$importer,$contact,$feedhub,1);
+       consume_feed($xml,$importer,$contact,$feedhub,1,1);
 
        // do it a second time so that any children find their parents.
 
-       consume_feed($xml,$importer,$contact,$feedhub,1);
+       consume_feed($xml,$importer,$contact,$feedhub,1,2);
 
        hub_post_return();