harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix safe search, and also make it an xconfig

Browse Source
This commit is contained in:
Thomas Willingham 2013-11-09 15:36:14 +00:00
parent 3a9cbcaf01
commit c030330abc
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/directory.php
View File

@ -28,8 +28,10 @@ function directory_content(&$a) {
$safe_mode = 1; $safe_mode = 1;
if(local_user()) { $observer = get_observer_hash();
$safe_mode = get_pconfig(local_user(),'directory','safe_mode');
if($observer) {
$safe_mode = get_xconfig($observer,'directory','safe_mode');
} }
if($safe_mode === false) if($safe_mode === false)
$safe_mode = 1; $safe_mode = 1;
@ -37,7 +39,10 @@ function directory_content(&$a) {
$safe_mode = intval($safe_mode); $safe_mode = intval($safe_mode);
if(x($_REQUEST,'safe')) if(x($_REQUEST,'safe'))
$safe_mode = intval($_REQUEST['safe']); $safe_mode = (intval($_REQUEST['safe']));
$o = ''; $o = '';
nav_set_selected('directory'); nav_set_selected('directory');
@ -88,7 +93,9 @@ function directory_content(&$a) {
$numtags = get_config('system','directorytags'); $numtags = get_config('system','directorytags');
$kw = ((intval($numtags)) ? $numtags : 24); $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 : ''); $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : '');
logger('query: ' . $query);
if($search) if($search)
$query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
if(strpos($search,'@')) if(strpos($search,'@'))

7
mod/dirsearch.php
View File

@ -43,9 +43,10 @@ function dirsearch_content(&$a) {
$kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 );
// by default use a safe search // 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(array_key_exists('sync',$_REQUEST)) {
if($_REQUEST['sync']) if($_REQUEST['sync'])
$sync = datetime_convert('UTC','UTC',$_REQUEST['sync']); $sync = datetime_convert('UTC','UTC',$_REQUEST['sync']);