Merge pull request #562 from fermionic/20121225-smarty-includes-like-friendicas

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 93d50ef90e0efb794f2a5a92299190acc670827a..0e29628b8079bd34392657252582e9d7bd875963 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,25 +44,33 @@ function pubsub_init(&$a) {
 
                $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 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];
 
@@ -104,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' AND `account_expired` = 0 LIMIT 1",
+       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
        if(! count($r))