Merge remote branch 'upstream/master'

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
old mode 100644 (file)
new mode 100755 (executable)
index 4dff5d5..93d50ef
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,7 +44,7 @@ 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))
@@ -69,8 +69,13 @@ function pubsub_init(&$a) {
                // 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 +104,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 +137,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();