keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

We don't need the contact-id anymore

Browse source
This commit is contained in:
Michael 2018-03-13 07:16:31 +00:00
parent 32ee4ca4b1
commit 4d3b1ae918
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mod/pubsub.php
View file

@ -57,19 +57,24 @@ function pubsub_init(App $a) {
$owner = $r[0]; $owner = $r[0];
$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : ''); if (!empty($hub_verify)) {
$sql_extra = sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify));
$log_info = 'hub-verify: ' . $hub_verify;
} else {
$sql_extra = sprintf(" AND `id` = %d ", intval($contact_id));
$log_info = 'contact-id: ' . $contact_id;
}
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d $r = q("SELECT * FROM `contact` WHERE `uid` = %d
AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1", AND NOT `blocked` AND NOT `pending` $sql_extra LIMIT 1",
intval($contact_id),
intval($owner['uid']) intval($owner['uid'])
); );
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
logger('pubsub: contact '.$contact_id.' not found.'); logger('pubsub: contact not found. ' . $log_info);
hub_return(false, ''); hub_return(false, '');
} }
if ($hub_topic) { if (!empty($hub_topic)) {
if (!link_compare($hub_topic,$r[0]['poll'])) { if (!link_compare($hub_topic,$r[0]['poll'])) {
logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']); logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
// should abort but let's humour them. // should abort but let's humour them.
@ -86,11 +91,11 @@ function pubsub_init(App $a) {
logger('pubsub: bogus unsubscribe'); logger('pubsub: bogus unsubscribe');
hub_return(false, ''); hub_return(false, '');
} }
logger('pubsub: unsubscribe success');
} }
if ($hub_mode) { if (!empty($hub_mode)) {
dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]); dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
logger('pubsub: ' . $hub_mode . ' success');
} }
hub_return(true, $hub_challenge); hub_return(true, $hub_challenge);
} }