X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=e2d3f4d367bf94ebdea47c62c85d3df3fb5d8f22;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=1a7905ef6455a9fe45809c01c72cc675b02e95cb;hpb=8992577bb63ba38bc3479dbbd8cf764ca1b15de5;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index 1a7905ef64..e2d3f4d367 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -352,7 +352,7 @@ function settings_post(&$a) {
 	check_form_security_token_redirectOnErr('/settings', 'settings');
 
 	if (x($_POST,'resend_relocate')) {
-		proc_run('php', 'include/notifier.php', 'relocate', local_user());
+		proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', local_user());
 		info(t("Relocate message has been send to your contacts"));
 		goaway('settings');
 	}
@@ -614,21 +614,15 @@ function settings_post(&$a) {
 		// Update global directory in background
 		$url = $_SESSION['my_url'];
 		if($url && strlen(get_config('system','directory')))
-			proc_run('php',"include/directory.php","$url");
-
-	}
-
-	$r = q("SELECT `url` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
-	if ($r) {
-		$gcontact = array("name" => $username, "generation" => 1, "hide" => ($hidewall OR !$net_publish),
-				"network" => NETWORK_DFRN, "url" => $r[0]["url"], "updated" => datetime_convert());
-
-		update_gcontact($gcontact);
+			proc_run(PRIORITY_LOW, "include/directory.php", $url);
 	}
 
 	require_once('include/profile_update.php');
 	profile_change();
 
+	// Update the global contact for the user
+	update_gcontact_for_user(local_user());
+
 	//$_SESSION['theme'] = $theme;
 	if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
 
@@ -637,7 +631,7 @@ function settings_post(&$a) {
 
 	}
 
-	goaway('settings' );
+	goaway('settings');
 	return; // NOTREACHED
 }
 
@@ -995,6 +989,9 @@ function settings_content(&$a) {
 			'$infinite_scroll'	=> array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
 			'$no_auto_update'	=> array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
 
+			'$d_tset' => t('General Theme Settings'),
+			'$d_ctset' => t('Custom Theme Settings'),
+			'$d_cset' => t('Content Settings'),
 			'stitle' => t('Theme settings'),
 			'$theme_config' => $theme_config,
 		));
@@ -1287,7 +1284,7 @@ function settings_content(&$a) {
 		'$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
 		'$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
 
-        '$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')),
+		'$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')),
 
 		'$email_textonly' => array('email_textonly', t('Text-only notification emails'),
 									get_pconfig(local_user(),'system','email_textonly'),