X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=9613229dab04e3381f63a657448acb447f55e6ca;hb=724f9c80e79783957d75d011a0393f6d6bb1949e;hp=658a248c62fe091f7ce3a2d376cc3dae7934f9a9;hpb=1471385157866b1deabe69dd6678dac220afd90e;p=friendica.git diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 658a248c62..9613229dab 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -25,6 +25,8 @@ function dfrn_poll_init(&$a) { $dfrn_id = substr($dfrn_id,2); } + $hidewall = false; + if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { http_status_exit(403); @@ -35,16 +37,17 @@ function dfrn_poll_init(&$a) { $r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1", dbesc($a->argv[1]) ); - if(! $r) + if (!$r) http_status_exit(404); - if(($r[0]['hidewall']) && (! local_user())) - http_status_exit(403); + + $hidewall = ($r[0]['hidewall'] && !local_user()); + $user = $r[0]['nickname']; } logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user); header("Content-type: application/atom+xml"); - echo dfrn_feed($a, '', $user,$last_update); + echo dfrn::feed('', $user,$last_update, 0, $hidewall); killme(); } @@ -371,7 +374,7 @@ function dfrn_poll_post(&$a) { } header("Content-type: application/atom+xml"); - $o = dfrn_feed($a,$dfrn_id, $a->argv[1], $last_update, $direction); + $o = dfrn::feed($dfrn_id, $a->argv[1], $last_update, $direction); echo $o; killme();