diff options
| author | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
| commit | fb817a29a934a68f194a42c29d3ed11da2da558f (patch) | |
| tree | fdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23 /mod/dfrn_poll.php | |
| parent | fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (diff) | |
| parent | 928e6c7ef78d251429a7d5c1fd4fdb8e6c282d41 (diff) | |
| download | volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.gz volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.bz2 volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/dfrn_poll.php')
| -rwxr-xr-x | mod/dfrn_poll.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index fe5cd4906..6030587ce 100755 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -26,21 +26,24 @@ function dfrn_poll_init(&$a) { $dfrn_id = substr($dfrn_id,2); } - if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) { + if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { killme(); } - $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1", - dbesc($a->argv[1]) - ); - if(count($r) && $r[0]['hidewall']) - killme(); + $user = ''; + if($a->argc > 1) { + $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1", + dbesc($a->argv[1]) + ); + if((! count($r)) || (count($r) && $r[0]['hidewall'])) + killme(); + $user = $r[0]['nickname']; + } - logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] ); + logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user); header("Content-type: application/atom+xml"); - $o = get_feed_for($a, '', $a->argv[1],$last_update); - echo $o; + echo get_feed_for($a, '', $user,$last_update); killme(); } |