From 3fbf78a859cef17244e82d27ea00fdd22041b4a8 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 9 Nov 2013 17:56:19 +0100 Subject: fix directory leaking to ppl which aint got zot in searchbar-autocomplete if block_public is enabled --- mod/acl.php | 6 +++++- mod/directory.php | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mod/acl.php b/mod/acl.php index b886b7e58..0ce179ae0 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -228,6 +228,10 @@ function navbar_complete(&$a) { // logger('navbar_complete'); + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + return login(); + } + $dirmode = intval(get_config('system','directory_mode')); $search = ((x($_REQUEST,'query')) ? htmlentities($_REQUEST['query'],ENT_COMPAT,'UTF-8',false) : ''); if(! $search || mb_strlen($search) < 2) @@ -278,4 +282,4 @@ function navbar_complete(&$a) { } } return array(); -} \ No newline at end of file +} diff --git a/mod/directory.php b/mod/directory.php index 13855cff7..9d2a9d19c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,6 +14,11 @@ function directory_aside(&$a) { require_once('include/contact_widgets.php'); $a->set_widget('find_people',findpeople_widget()); } + + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + return; + } + $a->set_widget('dir_sort_order',dir_sort_links()); } -- cgit v1.2.3