X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=905a5ed08d5cbbbbc74ef4c677c44370a578c7b1;hb=0db83b958659582ef2a7a20226cc7eea06bd9397;hp=77a5755855bc3e2e6b24b33dc7a1f3c76f0021f4;hpb=c0e87b2beac1f326f97eac6e7f97f95e12498405;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index 77a5755855..905a5ed08d 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -39,61 +39,71 @@ function settings_init(&$a) {
 	$tabs = array(
 		array(
 			'label'	=> t('Account'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
+			'url' 	=> 'settings',
 			'selected'	=>  (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
 			'accesskey' => 'o',
 		),
-		array(
-			'label'	=> t('Additional features'),
-			'url' 	=> $a->get_baseurl(true).'/settings/features',
-			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
-			'accesskey' => 't',
-		),
-		array(
-			'label'	=> t('Display'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-			'accesskey' => 'i',
-		),
+	);
 
-		array(
-			'label'	=> t('Social Networks'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-			'accesskey' => 'w',
-		),
-		array(
-			'label'	=> t('Plugins'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-			'accesskey' => 'l',
-		),
-		array(
-			'label'	=> t('Delegations'),
-			'url' 	=> $a->get_baseurl(true).'/delegate',
-			'selected'	=> (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
-			'accesskey' => 'd',
-		),
-		array(
-			'label' => t('Connected apps'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-			'accesskey' => 'b',
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
-			'accesskey' => 'e',
-		),
-		array(
-			'label' => t('Remove account'),
-			'url' => $a->get_baseurl(true) . '/removeme',
-			'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
-			'accesskey' => 'r',
-		)
+	if(get_features()) {
+		$tabs[] =	array(
+					'label'	=> t('Additional features'),
+					'url' 	=> 'settings/features',
+					'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
+					'accesskey' => 't',
+				);
+	}
+
+	$tabs[] =	array(
+		'label'	=> t('Display'),
+		'url' 	=> 'settings/display',
+		'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+		'accesskey' => 'i',
 	);
 
+	$tabs[] =	array(
+		'label'	=> t('Social Networks'),
+		'url' 	=> 'settings/connectors',
+		'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+		'accesskey' => 'w',
+	);
+
+	$tabs[] =	array(
+		'label'	=> t('Plugins'),
+		'url' 	=> 'settings/addon',
+		'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+		'accesskey' => 'l',
+	);
+
+	$tabs[] =	array(
+		'label'	=> t('Delegations'),
+		'url' 	=> 'delegate',
+		'selected'	=> (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
+		'accesskey' => 'd',
+	);
+
+	$tabs[] =	array(
+		'label' => t('Connected apps'),
+		'url' => 'settings/oauth',
+		'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+		'accesskey' => 'b',
+	);
+
+	$tabs[] =	array(
+		'label' => t('Export personal data'),
+		'url' => 'uexport',
+		'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
+		'accesskey' => 'e',
+	);
+
+	$tabs[] =	array(
+		'label' => t('Remove account'),
+		'url' => 'removeme',
+		'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
+		'accesskey' => 'r',
+	);
+
+
 	$tabtpl = get_markup_template("generic_links_widget.tpl");
 	$a->page['aside'] = replace_macros($tabtpl, array(
 		'$title' => t('Settings'),
@@ -289,9 +299,11 @@ function settings_post(&$a) {
 		$infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll'])  : 0);
 		$no_auto_update = ((x($_POST,'no_auto_update')) ? intval($_POST['no_auto_update'])  : 0);
 		$browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
-		$browser_update   = $browser_update * 1000;
-		if($browser_update < 10000)
-			$browser_update = 10000;
+		if ($browser_update != -1) {
+			$browser_update   = $browser_update * 1000;
+			if ($browser_update < 10000)
+				$browser_update = 10000;
+		}
 
 		$itemspage_network   = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
 		if($itemspage_network > 100)
@@ -330,7 +342,7 @@ function settings_post(&$a) {
 		);
 
 		call_hooks('display_settings_post', $_POST);
-		goaway($a->get_baseurl(true) . '/settings/display' );
+		goaway('settings/display' );
 		return; // NOTREACHED
 	}
 
@@ -339,7 +351,7 @@ function settings_post(&$a) {
 	if (x($_POST,'resend_relocate')) {
 		proc_run('php', 'include/notifier.php', 'relocate', local_user());
 		info(t("Relocate message has been send to your contacts"));
-		goaway($a->get_baseurl(true) . '/settings');
+		goaway('settings');
 	}
 
 	call_hooks('settings_post', $_POST);
@@ -615,12 +627,11 @@ function settings_post(&$a) {
 
 	}
 
-	goaway($a->get_baseurl(true) . '/settings' );
+	goaway('settings' );
 	return; // NOTREACHED
 }
 
 
-if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
 	$o = '';
@@ -745,7 +756,7 @@ function settings_content(&$a) {
 			$arr[$fname] = array();
 			$arr[$fname][0] = $fdata[0];
 			foreach(array_slice($fdata,1) as $f) {
-				$arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
+				$arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
 			}
 		}
 
@@ -921,7 +932,8 @@ function settings_content(&$a) {
 		$mobile_theme_selected = (!x($_SESSION,'mobile-theme')? $default_mobile_theme : $_SESSION['mobile-theme']);
 
 		$browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
-		$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
+		if (intval($browser_update) != -1)
+			$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
 
 		$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
 		$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
@@ -960,7 +972,7 @@ function settings_content(&$a) {
 
 			'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes, true),
 			'$mobile_theme'	=> array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false),
-			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
+			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')),
 			'$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
 			'$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
 			'$nosmile'	=> array('nosmile', t("Don't show emoticons"), $nosmile, ''),
@@ -1140,7 +1152,7 @@ function settings_content(&$a) {
 		info( t('Profile is <strong>not published</strong>.') . EOL );
 
 
-	//$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+	//$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . 'profile/' . $nickname : '');
 
 	$tpl_addr = get_markup_template("settings_nick_set.tpl");
 
@@ -1284,5 +1296,5 @@ function settings_content(&$a) {
 
 	return $o;
 
-}}
+}