diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-11-12 02:09:32 -0800 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-11-12 02:09:32 -0800 |
| commit | 67a101452b82782114143dc0b5bdba15adc0ba99 (patch) | |
| tree | 9daee3807b370d02ee4c28e6df7db08731fbb9f1 /mod/directory.php | |
| parent | b23f3fc03b6bc751aab67fe2258a21f7c65bab8e (diff) | |
| parent | 7cb4c2f8ad813336aafdec05e40f3a8eb1808d00 (diff) | |
| download | volse-hubzilla-67a101452b82782114143dc0b5bdba15adc0ba99.tar.gz volse-hubzilla-67a101452b82782114143dc0b5bdba15adc0ba99.tar.bz2 volse-hubzilla-67a101452b82782114143dc0b5bdba15adc0ba99.zip | |
Merge pull request #4 from friendica/master
Fork aligned to red master
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/mod/directory.php b/mod/directory.php index 13855cff7..1f22e9bf8 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,8 +14,15 @@ function directory_aside(&$a) { require_once('include/contact_widgets.php'); $a->set_widget('find_people',findpeople_widget()); } - $a->set_widget('dir_sort_order',dir_sort_links()); + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + return; + } + + $a->set_widget('safe_search',dir_safe_mode()); + + $a->set_widget('dir_sort_order',dir_sort_links()); + } @@ -28,8 +35,10 @@ function directory_content(&$a) { $safe_mode = 1; - if(local_user()) { - $safe_mode = get_pconfig(local_user(),'directory','safe_mode'); + $observer = get_observer_hash(); + + if($observer) { + $safe_mode = get_xconfig($observer,'directory','safe_mode'); } if($safe_mode === false) $safe_mode = 1; @@ -37,7 +46,10 @@ function directory_content(&$a) { $safe_mode = intval($safe_mode); if(x($_REQUEST,'safe')) - $safe_mode = intval($_REQUEST['safe']); + $safe_mode = (intval($_REQUEST['safe'])); + + + $o = ''; nav_set_selected('directory'); @@ -89,6 +101,7 @@ function directory_content(&$a) { $kw = ((intval($numtags)) ? $numtags : 24); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); + if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) |