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

make public forums only setting sticky and simplify function to get directory settings

Browse Source
This commit is contained in:
Mario Vavti 2015-07-07 21:41:37 +02:00
parent cc7eaa0d05
commit 9c577e0422
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/dir_fns.php
View File

@ -72,33 +72,20 @@ function check_upstream_directory() {
set_config('system', 'directory_server', ''); set_config('system', 'directory_server', '');
} }
function get_globaldir_setting($observer) { function get_directory_settings($observer, $setting) {
if ($observer) if ($observer)
$globaldir = get_xconfig($observer,'directory','globaldir'); $ret = get_xconfig($observer, 'directory', $setting);
else else
$globaldir = ((array_key_exists('globaldir',$_SESSION)) ? intval($_SESSION['globaldir']) : false); $ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
if($globaldir === false) if($ret === false)
$globaldir = get_config('directory','globaldir'); $ret = get_config('directory', $setting);
return $globaldir; if($setting == 'safe_mode' && $ret === false)
} $ret = 1;
function get_safemode_setting($observer) { return $ret;
if ($observer)
$safe_mode = get_xconfig($observer,'directory','safe_mode');
else
$safe_mode = ((array_key_exists('safemode',$_SESSION)) ? intval($_SESSION['safemode']) : false);
if($safe_mode === false)
$safe_mode = get_config('directory','safe_mode');
if($safe_mode === false)
$safe_mode = 1;
return $safe_mode;
} }
/** /**
@ -110,8 +97,9 @@ function dir_sort_links() {
$observer = get_observer_hash(); $observer = get_observer_hash();
$safe_mode = get_safemode_setting($observer); $safe_mode = get_directory_settings($observer, 'safemode');
$globaldir = get_globaldir_setting($observer); $globaldir = get_directory_settings($observer, 'globaldir');
$pubforums = get_directory_settings($observer, 'pubforums');
// Build urls without order and pubforums so it's easy to tack on the changed value // Build urls without order and pubforums so it's easy to tack on the changed value
// Probably there's an easier way to do this // Probably there's an easier way to do this
@ -128,6 +116,7 @@ function dir_sort_links() {
$tmp = array_merge($_GET,$_POST); $tmp = array_merge($_GET,$_POST);
unset($tmp['suggest']); unset($tmp['suggest']);
unset($tmp['pubforums']);
unset($tmp['order']); unset($tmp['order']);
unset($tmp['q']); unset($tmp['q']);
unset($tmp['f']); unset($tmp['f']);
@ -152,10 +141,9 @@ function dir_sort_links() {
'$selected_sort' => $current_order, '$selected_sort' => $current_order,
'$sorturl' => $sorturl, '$sorturl' => $sorturl,
'$forumsurl' => $forumsurl, '$forumsurl' => $forumsurl,
'$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'','',' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''), '$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''),
'$pubforums' => array('pubforums', t('Public Forums Only'),$pubforums,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''),
'$pubforums' => array('pubforums', t('Public Forums Only'),(x($_REQUEST,'pubforums') ? $_REQUEST['pubforums'] : ''),'','',' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''), '$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
'$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'','',' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
)); ));
return $o; return $o;

2
include/taxonomy.php
View File

@ -276,7 +276,7 @@ function dir_tagblock($link,$r) {
$o = ''; $o = '';
$observer = get_observer_hash(); $observer = get_observer_hash();
if(! get_globaldir_setting($observer)) if(! get_directory_settings($observer, 'globaldir'))
return $o; return $o;

23
mod/directory.php
View File

@ -19,6 +19,7 @@ function directory_init(&$a) {
$observer = get_observer_hash(); $observer = get_observer_hash();
$global_changed = false; $global_changed = false;
$safe_changed = false; $safe_changed = false;
$pubforums_changed = false;
if(array_key_exists('global',$_REQUEST)) { if(array_key_exists('global',$_REQUEST)) {
$globaldir = intval($_REQUEST['global']); $globaldir = intval($_REQUEST['global']);
@ -37,9 +38,19 @@ function directory_init(&$a) {
if($safe_changed) { if($safe_changed) {
$_SESSION['safemode'] = $safemode; $_SESSION['safemode'] = $safemode;
if($observer) if($observer)
set_xconfig($observer,'directory','safe_mode',$safemode); set_xconfig($observer,'directory','safemode',$safemode);
} }
if(array_key_exists('pubforums',$_REQUEST)) {
$pubforums = intval($_REQUEST['pubforums']);
$pubforums_changed = true;
}
if($pubforums_changed) {
$_SESSION['pubforums'] = $pubforums;
if($observer)
set_xconfig($observer,'directory','pubforums',$pubforums);
}
} }
function directory_content(&$a) { function directory_content(&$a) {
@ -51,18 +62,14 @@ function directory_content(&$a) {
$observer = get_observer_hash(); $observer = get_observer_hash();
$globaldir = get_globaldir_setting($observer); $globaldir = get_directory_settings($observer, 'globaldir');
// override your personal global search pref if we're doing a navbar search of the directory // override your personal global search pref if we're doing a navbar search of the directory
if(intval($_REQUEST['navsearch'])) if(intval($_REQUEST['navsearch']))
$globaldir = 1; $globaldir = 1;
$safe_mode = get_safemode_setting($observer); $safe_mode = get_directory_settings($observer, 'safemode');
$pubforums = null; $pubforums = get_directory_settings($observer, 'pubforums');
if(array_key_exists('pubforums',$_REQUEST))
$pubforums = intval($_REQUEST['pubforums']);
if(! $pubforums)
$pubforums = null;
$o = ''; $o = '';
nav_set_selected('directory'); nav_set_selected('directory');