Database stuff. New table "thread". Changing "left join" to "inner join", removing...

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 93d50ef90e0efb794f2a5a92299190acc670827a..3d8bfca48e39a5db21e6384b2897cf5c31877530 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];
 
@@ -71,18 +79,18 @@ function pubsub_init(&$a) {
 
                if($hub_mode === 'unsubscribe') {
                        if(! strlen($hub_verify)) {
-                               logger('pubsub: bogus unsubscribe'); 
+                               logger('pubsub: bogus unsubscribe');
                                hub_return(false, '');
                        }
                        logger('pubsub: unsubscribe success');
                }
 
-               $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1",
+               $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
                        intval($subscribe),
                        intval($contact['id'])
                );
 
-               hub_return(true, $hub_challenge);               
+               hub_return(true, $hub_challenge);
        }
 }
 
@@ -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))
@@ -113,11 +121,12 @@ function pubsub_post(&$a) {
        $importer = $r[0];
 
        $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d 
-               AND ( `rel` = %d OR `rel` = %d ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+               AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                intval($contact_id),
                intval($importer['uid']),
                intval(CONTACT_IS_SHARING),
-               intval(CONTACT_IS_FRIEND)       
+               intval(CONTACT_IS_FRIEND),
+               dbesc(NETWORK_FEED)
        );
 
        if(! count($r)) {