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

rename function get_directory_settings => get_directory_setting and move sort options to directory title bar

Browse Source
This commit is contained in:
Mario Vavti
2015-07-07 22:29:27 +02:00
parent 9c577e0422
commit f67d9d59af
5 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/dir_fns.php
View File

@@ -72,7 +72,7 @@ function check_upstream_directory() {
set_config('system', 'directory_server', '');
}
function get_directory_settings($observer, $setting) {
function get_directory_setting($observer, $setting) {
if ($observer)
$ret = get_xconfig($observer, 'directory', $setting);
@@ -97,14 +97,13 @@ function dir_sort_links() {
$observer = get_observer_hash();
$safe_mode = get_directory_settings($observer, 'safemode');
$globaldir = get_directory_settings($observer, 'globaldir');
$pubforums = get_directory_settings($observer, 'pubforums');
$safe_mode = get_directory_setting($observer, 'safemode');
$globaldir = get_directory_setting($observer, 'globaldir');
$pubforums = get_directory_setting($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
$directory_sort_order = get_config('system','directory_sort_order');
if(! $directory_sort_order)
$directory_sort_order = 'date';
@@ -114,14 +113,6 @@ function dir_sort_links() {
$url = 'directory?f=';
$tmp = array_merge($_GET,$_POST);
unset($tmp['suggest']);
unset($tmp['pubforums']);
unset($tmp['order']);
unset($tmp['q']);
unset($tmp['f']);
$sorturl = $url . $suggest . http_build_query($tmp);
$tmp = array_merge($_GET,$_POST);
unset($tmp['suggest']);
unset($tmp['pubforums']);
@@ -133,13 +124,6 @@ function dir_sort_links() {
$o = replace_macros(get_markup_template('dir_sort_links.tpl'), array(
'$header' => t('Directory Options'),
'$normal' => t('Alphabetic'),
'$reverse' => t('Reverse Alphabetic'),
'$date' => t('Newest to Oldest'),
'$reversedate' => t('Oldest to Newest'),
'$sort' => t('Sort'),
'$selected_sort' => $current_order,
'$sorturl' => $sorturl,
'$forumsurl' => $forumsurl,
'$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)\''),