<?php
-if(! function_exists('hub_return')) {
function hub_return($valid,$body) {
if($valid) {
// NOTREACHED
}
-}
// when receiving an XML feed, always return OK
-if(! function_exists('hub_post_return')) {
+
function hub_post_return() {
+
header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
killme();
+
}
-}
-if(! function_exists('pubsub_init')) {
+
function pubsub_init(&$a) {
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
- $r = q("SELECT * FROM `contact` WHERE `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",
intval($contact_id),
intval($owner['uid'])
$contact = $r[0];
- // We must initiate an unsubscribe request with a verify_token.
+ // We must initiate an unsubscribe request with a verify_token.
// Don't allow outsiders to unsubscribe us.
if($hub_mode === 'unsubscribe') {
hub_return(true, $hub_challenge);
}
}
-}
require_once('include/security.php');
-if(! function_exists('pubsub_post')) {
function pubsub_post(&$a) {
$xml = file_get_contents('php://input');
$importer = $r[0];
- $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",
+ $r = q("SELECT * FROM `contact` WHERE `subhub` AND `id` = %d AND `uid` = %d
+ AND (`rel` = %d OR `rel` = %d OR network = '%s') AND NOT `blocked` LIMIT 1",
intval($contact_id),
intval($importer['uid']),
intval(CONTACT_IS_SHARING),
consume_feed($xml,$importer,$contact,$feedhub,1,2);
hub_post_return();
+
}
-}
+
+
+