From fbb01666906ba4f909dc9eac98aa3ca6a936b99e Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 7 Nov 2010 21:07:47 -0800 Subject: lint --- mod/pubsub.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'mod/pubsub.php') diff --git a/mod/pubsub.php b/mod/pubsub.php index e3392668e..760ffa9e9 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -29,15 +29,15 @@ function hub_post_return() { function pubsub_init(&$a) { $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); - $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); if($_SERVER['REQUEST_METHOD'] === 'GET') { - $hub_mode = notags(trim($_GET['hub_mode'])); - $hub_topic = notags(trim($_GET['hub_topic'])); - $hub_challenge = notags(trim($_GET['hub_challenge'])); - $hub_lease = notags(trim($_GET['hub_lease_seconds'])); - $hub_verify = notags(trim($_GET['hub_verify_token'])); + $hub_mode = ((x($_GET,'hub_mode')) ? notags(trim($_GET['hub_mode'])) : ''); + $hub_topic = ((x($_GET,'hub_topic')) ? notags(trim($_GET['hub_topic'])) : ''); + $hub_challenge = ((x($_GET,'hub_challenge')) ? notags(trim($_GET['hub_challenge'])) : ''); + $hub_lease = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : ''); + $hub_verify = ((x($_GET,'hub_verify_token')) ? notags(trim($_GET['hub_verify_token'])) : ''); logger('pubsub: Subscription from' . $_SERVER['REMOTE_ADDR'] . print_r($_GET,true)); @@ -75,8 +75,7 @@ function pubsub_init(&$a) { intval($contact['id']) ); - hub_return(true, $hub_challenge); - + hub_return(true, $hub_challenge); } } @@ -91,7 +90,7 @@ function pubsub_post(&$a) { logger('pubsub: data: ' . $xml, LOGGER_DATA); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); - $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($nick) -- cgit v1.2.3