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
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', '');
}
function get_globaldir_setting($observer) {
if($observer)
$globaldir = get_xconfig($observer,'directory','globaldir');
else
$globaldir = ((array_key_exists('globaldir',$_SESSION)) ? intval($_SESSION['globaldir']) : false);
if($globaldir === false)
$globaldir = get_config('directory','globaldir');
return $globaldir;
}
function get_safemode_setting($observer) {
function get_directory_settings($observer, $setting) {
if ($observer)
$safe_mode = get_xconfig($observer,'directory','safe_mode');
$ret = get_xconfig($observer, 'directory', $setting);
else
$safe_mode = ((array_key_exists('safemode',$_SESSION)) ? intval($_SESSION['safemode']) : false);
$ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
if($safe_mode === false)
$safe_mode = get_config('directory','safe_mode');
if($ret === false)
$ret = get_config('directory', $setting);
if($safe_mode === false)
$safe_mode = 1;
if($setting == 'safe_mode' && $ret === false)
$ret = 1;
return $safe_mode;
return $ret;
}
/**
@@ -110,8 +97,9 @@ function dir_sort_links() {
$observer = get_observer_hash();
$safe_mode = get_safemode_setting($observer);
$globaldir = get_globaldir_setting($observer);
$safe_mode = get_directory_settings($observer, 'safemode');
$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
// Probably there's an easier way to do this
@@ -128,6 +116,7 @@ function dir_sort_links() {
$tmp = array_merge($_GET,$_POST);
unset($tmp['suggest']);
unset($tmp['pubforums']);
unset($tmp['order']);
unset($tmp['q']);
unset($tmp['f']);
@@ -152,10 +141,9 @@ function dir_sort_links() {
'$selected_sort' => $current_order,
'$sorturl' => $sorturl,
'$forumsurl' => $forumsurl,
'$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'','',' onchange=\'window.location.href="' . $forumsurl . '&safe="+(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),'','',' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
'$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)\''),
'$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)\''),
));
return $o;

4
include/taxonomy.php
View File

@@ -276,7 +276,7 @@ function dir_tagblock($link,$r) {
$o = '';
$observer = get_observer_hash();
if(! get_globaldir_setting($observer))
if(! get_directory_settings($observer, 'globaldir'))
return $o;
@@ -407,4 +407,4 @@ function get_things($profile_hash,$uid) {
//logger('things: ' . print_r($sorted_things,true));
return $sorted_things;
}
}