From c030330abcbc7584db0d2abfb84acbb10211ee17 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 9 Nov 2013 15:36:14 +0000
Subject: Fix safe search, and also make it an xconfig

---
 mod/directory.php | 13 ++++++++++---
 mod/dirsearch.php |  7 ++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

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,'@'))
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 527eb4c50..dcacef651 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -43,9 +43,10 @@ function dirsearch_content(&$a) {
 	$kw       = ((x($_REQUEST,'kw'))       ? intval($_REQUEST['kw'])    : 0 );
 
 	// by default use a safe search
-	$safe     = ((x($_REQUEST,'safe'))     ? intval($_REQUEST['safe'])  : 1 );
-
-
+	$safe     = ((x($_REQUEST,'safe')));    // ? intval($_REQUEST['safe'])  : 1 );
+	if ($safe === false)
+			$safe = 1;
+		
 	if(array_key_exists('sync',$_REQUEST)) {
 		if($_REQUEST['sync'])
 			$sync = datetime_convert('UTC','UTC',$_REQUEST['sync']);
-- 
cgit v1.2.3