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: [PATCH 1/6] 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']);

From 420a80e8f3e65aa0692c93c60759e89a826d9b28 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 9 Nov 2013 15:38:24 +0000
Subject: [PATCH 2/6] Kill logging/comment

---
 mod/directory.php | 2 --
 1 file changed, 2 deletions(-)

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,'@'))

From 6f2163a08ec6b48a113e768c8fc0a94f8dd0bde1 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 9 Nov 2013 18:13:08 +0000
Subject: [PATCH 3/6] Add a safesearch toggle

---
 mod/toggle_safesearch.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 mod/toggle_safesearch.php

diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php
new file mode 100644
index 000000000..1294520c6
--- /dev/null
+++ b/mod/toggle_safesearch.php
@@ -0,0 +1,22 @@
+<?php
+
+function toggle_safesearch_init(&$a) {
+
+$observer = get_observer_hash();
+
+if($observer) 
+	$safe_mode = get_xconfig($observer,'directory','safe_mode');
+	
+if($safe_mode == 0)
+	set_xconfig($observer,'directory','safe_mode', '1');
+if($safe_mode == 1)
+	set_xconfig($observer,'directory','safe_mode', '0');
+
+if(isset($_GET['address']))
+	$address = $_GET['address'];
+else
+	$address = z_root();
+
+	goaway($address);
+}
+	

From 7b29400c6c8448718f156aff73754f669992ee69 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 9 Nov 2013 18:43:40 +0000
Subject: [PATCH 4/6] Bring safe search to the UI

---
 include/dir_fns.php     | 18 ++++++++++++++++++
 mod/directory.php       |  5 ++++-
 view/tpl/safesearch.tpl |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 view/tpl/safesearch.tpl

diff --git a/include/dir_fns.php b/include/dir_fns.php
index e234ae0fa..319be25c4 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -20,7 +20,25 @@ function dir_sort_links() {
 	return $o;
 }
 
+function dir_safe_mode(&$a) {
+	$observer = get_observer_hash();
+	
+//	if ($observer)
+		$safe_mode = get_xconfig($observer,'directory','safe_mode');		
+	if($safe_mode == 0)
+		$toggle = t('Enable Safe Search');
+	else
+		$toggle = t('Disable Safe Search');
+	$o = replace_macros(get_markup_template('safesearch.tpl'), array(
+		'$toggle' => $toggle,
+	));
 
+	return $o;
+}
+
+if($safe_mode == 1)
+	set_xconfig($observer,'directory','safe_mode', '0');	
+		
 function sync_directories($dirmode) {
 
 	if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL)
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,'@'))
diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl
new file mode 100644
index 000000000..92c3db2a5
--- /dev/null
+++ b/view/tpl/safesearch.tpl
@@ -0,0 +1,2 @@
+<h1>Safe Mode</h1>
+<a href="toggle_safesearch">{{$toggle}}</a>

From 8569fda732238fe8f1fd845e0b273cc325033df0 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 9 Nov 2013 18:45:52 +0000
Subject: [PATCH 5/6] Clean up

---
 include/dir_fns.php | 2 +-
 mod/directory.php   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/dir_fns.php b/include/dir_fns.php
index 319be25c4..cd812ddc7 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -23,7 +23,7 @@ function dir_sort_links() {
 function dir_safe_mode(&$a) {
 	$observer = get_observer_hash();
 	
-//	if ($observer)
+	if ($observer)
 		$safe_mode = get_xconfig($observer,'directory','safe_mode');		
 	if($safe_mode == 0)
 		$toggle = t('Enable Safe Search');
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,'@'))

From bbe16eba346274daae7532158e997b7becde5cc2 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 9 Nov 2013 18:49:50 +0000
Subject: [PATCH 6/6] Stray line

---
 include/dir_fns.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/dir_fns.php b/include/dir_fns.php
index cd812ddc7..0d0507059 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -36,9 +36,6 @@ function dir_safe_mode(&$a) {
 	return $o;
 }
 
-if($safe_mode == 1)
-	set_xconfig($observer,'directory','safe_mode', '0');	
-		
 function sync_directories($dirmode) {
 
 	if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL)