mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 09:35:11 +00:00
Fix safe search, and also make it an xconfig
This commit is contained in:
parent
3a9cbcaf01
commit
c030330abc
2 changed files with 14 additions and 6 deletions
|
@ -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,'@'))
|
||||
|
|
|
@ -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']);
|
||||
|
|
Loading…
Reference in a new issue