diff options
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mod/directory.php b/mod/directory.php index 9d2a9d19c..1f22e9bf8 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -19,8 +19,10 @@ function directory_aside(&$a) { return; } - $a->set_widget('dir_sort_order',dir_sort_links()); + $a->set_widget('safe_search',dir_safe_mode()); + $a->set_widget('dir_sort_order',dir_sort_links()); + } @@ -33,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; @@ -42,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'); @@ -94,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,'@')) |