X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=dbbac8bdeb3c9b14f2eededb6a74242c64889d29;hb=21693295474f5acaa21526ae05fa80a731eb1a6a;hp=0f01807a20af74bf99a873d762bb9bbe2c75ce6b;hpb=43283fd35fb9987a1554612220f11a0875697bd4;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index 0f01807a20..dbbac8bdeb 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -15,15 +15,18 @@ function settings_post(&$a) {
 		return;
 	}
 
-	call_hooks('settings_post', $_POST);
-
-	if(($a->argc > 1) && ($a->argv[1] == 'addon'))
-		return;
-
 	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
+
+	if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+		call_hooks('plugin_settings_post', $_POST);
+		return;
+	}
+
+	call_hooks('settings_post', $_POST);
+
 	if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
 
 		$newpass = $_POST['npassword'];
@@ -84,17 +87,24 @@ function settings_post(&$a) {
 
 	$err = '';
 
+	$name_change = false;
+
 	if($username != $a->user['username']) {
-        	if(strlen($username) > 40)
-                	$err .= t(' Please use a shorter name.');
-        	if(strlen($username) < 3)
-                	$err .= t(' Name too short.');
+		$name_change = true;
+		if(strlen($username) > 40)
+			$err .= t(' Please use a shorter name.');
+		if(strlen($username) < 3)
+			$err .= t(' Name too short.');
 	}
 
 	if($email != $a->user['email']) {
 		$email_changed = true;
         if(! valid_email($email))
 			$err .= t(' Not valid email.');
+		if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
+			$err .= t(' Cannot change to that email.');
+			$email = $a->user['email'];
+		}
 	}
 
 	if(strlen($err)) {
@@ -158,13 +168,22 @@ function settings_post(&$a) {
 		intval(local_user())
 	);
 
+
+	if($name_change) {
+		q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+			dbesc($username),
+			dbesc(datetime_convert()),
+			intval(local_user())
+		);
+	}		
+
 	if($old_visibility != $net_publish) {
 		// Update global directory in background
 		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 		$url = $_SESSION['my_url'];
 		if($url && strlen(get_config('system','directory_submit_url')))
-			proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
-				array(),$foo));
+			//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
+			proc_run($php_path,"include/directory.php","$url");
 	}
 
 	$_SESSION['theme'] = $theme;
@@ -291,10 +310,15 @@ function settings_content(&$a) {
 
 	$theme_selector = '<select name="theme" id="theme-select" >';
 	$files = glob('view/theme/*');
+
+	$default_theme = get_config('system','theme');
+	if(! $default_theme)
+		$default_theme = 'default';
+
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file);
-			$selected = (($f == $_SESSION['theme']) || ($f === 'default' && (! x($_SESSION,'theme')))
+			$selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
 				? ' selected="selected" ' : '' );
 			$theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
 		}