straighten out some directory stuff, which required some Comanche structural changes

This commit is contained in:
friendica
2015-03-05 18:24:49 -08:00
parent e73d0ee418
commit 22391a2437
7 changed files with 110 additions and 43 deletions

View File

@@ -74,7 +74,26 @@ function check_upstream_directory() {
function dir_sort_links() {
// Build urls without order and pubforums so it's easy to tack on the changed value
$safe_mode = 1;
$observer = get_observer_hash();
if ($observer)
$safe_mode = get_xconfig($observer,'directory','safe_mode');
if($safe_mode === false)
$safe_mode = 1;
if(! $safe_mode)
$toggle = t('Enable Safe Search');
else
$toggle = t('Disable Safe Search');
if($observer)
$globaldir = get_xconfig($observer,'directory','globaldir');
else
$globaldir = ((array_key_exists('globaldir',$_SESSION)) ? intval($_SESSION['globaldir']) : false);
// 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
$current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : 'normal');
@@ -104,7 +123,10 @@ function dir_sort_links() {
'$selected_sort' => $current_order,
'$sorturl' => $sorturl,
'$forumsurl' => $forumsurl,
'$safemode' => t('Safe Mode'),
'$toggle' => $toggle,
'$globaldir' => $globaldir,
'$localdir' => t('This Website Only'),
));
return $o;
}