From c030330abcbc7584db0d2abfb84acbb10211ee17 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 15:36:14 +0000 Subject: Fix safe search, and also make it an xconfig --- mod/directory.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mod/directory.php') diff --git a/mod/directory.php b/mod/directory.php index 13855cff7..9a5b34647 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -28,8 +28,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 +39,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'); @@ -88,7 +93,9 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); +// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); +logger('query: ' . $query); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) -- cgit v1.2.3 From 420a80e8f3e65aa0692c93c60759e89a826d9b28 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 15:38:24 +0000 Subject: Kill logging/comment --- mod/directory.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'mod/directory.php') diff --git a/mod/directory.php b/mod/directory.php index 9a5b34647..18085e83e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -93,9 +93,7 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); -// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); -logger('query: ' . $query); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) -- cgit v1.2.3 From 7b29400c6c8448718f156aff73754f669992ee69 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 18:43:40 +0000 Subject: Bring safe search to the UI --- mod/directory.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mod/directory.php') diff --git a/mod/directory.php b/mod/directory.php index 18085e83e..61a40f8d4 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,8 +14,9 @@ function directory_aside(&$a) { require_once('include/contact_widgets.php'); $a->set_widget('find_people',findpeople_widget()); } + $a->set_widget('safe_search',dir_safe_mode()); $a->set_widget('dir_sort_order',dir_sort_links()); - + } @@ -93,7 +94,9 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); +// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); +logger('query: ' . $query); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) -- cgit v1.2.3 From 8569fda732238fe8f1fd845e0b273cc325033df0 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 18:45:52 +0000 Subject: Clean up --- mod/directory.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mod/directory.php') diff --git a/mod/directory.php b/mod/directory.php index 61a40f8d4..657ecd8f9 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -94,9 +94,8 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); -// $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); -logger('query: ' . $query); + if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) -- cgit v1.2.3