diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-11-09 15:36:14 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-11-09 15:36:14 +0000 |
| commit | c030330abcbc7584db0d2abfb84acbb10211ee17 (patch) | |
| tree | 6e195f723fe3e7378c027ad6b9379d8db862e789 | |
| parent | 3a9cbcaf011f5c5d423e1cd99b43442669692129 (diff) | |
| download | volse-hubzilla-c030330abcbc7584db0d2abfb84acbb10211ee17.tar.gz volse-hubzilla-c030330abcbc7584db0d2abfb84acbb10211ee17.tar.bz2 volse-hubzilla-c030330abcbc7584db0d2abfb84acbb10211ee17.zip | |
Fix safe search, and also make it an xconfig
| -rw-r--r-- | mod/directory.php | 13 | ||||
| -rw-r--r-- | 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']); |