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

Merge https://github.com/friendica/red into zpull

Browse Source 
Conflicts:
	mod/directory.php
This commit is contained in:
friendica 2013-11-09 12:14:06 -08:00
commit e06b0aa767
5 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/dir_fns.php
View File

@ -20,6 +20,21 @@ function dir_sort_links() {
return $o; 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;
}
function sync_directories($dirmode) { function sync_directories($dirmode) {

14
mod/directory.php
View File

@ -19,6 +19,8 @@ function directory_aside(&$a) {
return; return;
} }
$a->set_widget('safe_search',dir_safe_mode());
$a->set_widget('dir_sort_order',dir_sort_links()); $a->set_widget('dir_sort_order',dir_sort_links());
} }
@ -33,8 +35,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;
@ -42,7 +46,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');
@ -94,6 +101,7 @@ function directory_content(&$a) {
$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 : '');
if($search) if($search)
$query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
if(strpos($search,'@')) if(strpos($search,'@'))

5
mod/dirsearch.php
View File

@ -43,8 +43,9 @@ 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'])

22
mod/toggle_safesearch.php Normal file
View File

@ -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);
}

2
view/tpl/safesearch.tpl Normal file
View File

@ -0,0 +1,2 @@
<h1>Safe Mode</h1>
<a href="toggle_safesearch">{{$toggle}}</a>