X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=beb73b4e2c4ce53a9ed5a6fcaf3ea56108e2040c;hb=26983bafff024adab0339b828ec21d83fc5d1007;hp=82458f46ac9bab35de55c705608ef7c9fd179740;hpb=84189ac775b3e1bc36d9e9d8945624c1bca7fb55;p=friendica.git diff --git a/mod/pubsub.php b/mod/pubsub.php index 82458f46ac..beb73b4e2c 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -63,14 +63,15 @@ function pubsub_init(&$a) { intval($owner['uid']) ); if(! count($r)) { - logger('pubsub: contact not found.'); + 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]; @@ -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); } @@ -120,7 +122,7 @@ function pubsub_post(&$a) { $importer = $r[0]; - $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d + $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", intval($contact_id), intval($importer['uid']),