X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=0c3b23a44b7801729411f0470ec17976a8e2507b;hb=02d14eafdae0160b1ac5794c3e07dcc326633dc8;hp=02a6955a00ff9dcf59eeeaf917d4dae25a1d45c7;hpb=8a5fada863364c729decea75c7b6e1549a7b81ce;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index 02a6955a00..0c3b23a44b 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'),
@@ -189,6 +199,7 @@ function settings_post(&$a) {
 		if(x($_POST, 'general-submit')) {
 			set_pconfig(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
 			set_pconfig(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
+			set_pconfig(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
 			set_pconfig(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
 		} elseif(x($_POST, 'imap-submit')) {
 
@@ -332,7 +343,7 @@ function settings_post(&$a) {
 		);
 
 		call_hooks('display_settings_post', $_POST);
-		goaway($a->get_baseurl(true) . '/settings/display' );
+		goaway('settings/display' );
 		return; // NOTREACHED
 	}
 
@@ -341,7 +352,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);
@@ -617,12 +628,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 = '';
@@ -747,7 +757,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')));
 			}
 		}
 
@@ -788,8 +798,11 @@ function settings_content(&$a) {
 		$settings_connectors .= '<span class="field_help">'.t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.').'</span>';
 		$settings_connectors .= '</div>';
 
+		$default_group = get_pconfig(local_user(), 'ostatus', 'default_group');
 		$legacy_contact = get_pconfig(local_user(), 'ostatus', 'legacy_contact');
 
+		$settings_connectors .= mini_group_select(local_user(), $default_group, t("Default group for OStatus contacts"));
+
 		if ($legacy_contact != "")
 			$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/ostatus_subscribe?url='.urlencode($legacy_contact).'">';
 
@@ -1143,7 +1156,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");
 
@@ -1287,5 +1300,5 @@ function settings_content(&$a) {
 
 	return $o;
 
-}}
+}