<?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) {
+
+function pubsub_init(App $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 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
logger('pubsub: local account not found: ' . $nick);
hub_return(false, '');
}
intval($contact_id),
intval($owner['uid'])
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
logger('pubsub: contact '.$contact_id.' not found.');
hub_return(false, '');
}
hub_return(true, $hub_challenge);
}
}
-}
require_once('include/security.php');
-if(! function_exists('pubsub_post')) {
-function pubsub_post(&$a) {
+function pubsub_post(App $a) {
$xml = file_get_contents('php://input');
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
hub_post_return();
+ }
$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),
dbesc(NETWORK_FEED)
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
hub_post_return();
}
consume_feed($xml,$importer,$contact,$feedhub,1,2);
hub_post_return();
+
}
-}
+
+
+