X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=ebe07612eb1fa152a0a5d6c74ec60ec15e8c73cf;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=eb27de06efc255aa8383750bcf71983b8d3f002d;hpb=527ff13f77af4a392e93b92e51774938a5ce9885;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index eb27de06ef..ebe07612eb 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,20 @@ 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_run('php',"include/directory.php","$url");
}
$_SESSION['theme'] = $theme;
@@ -247,13 +264,16 @@ function settings_content(&$a) {
}
-
-
- $opt_tpl = load_view_file("view/profile-in-directory.tpl");
- $profile_in_dir = replace_macros($opt_tpl,array(
- '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
- '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
- ));
+ if(get_config('system','publish_all')) {
+ $profile_in_dir = '';
+ }
+ else {
+ $opt_tpl = load_view_file("view/profile-in-directory.tpl");
+ $profile_in_dir = replace_macros($opt_tpl,array(
+ '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
+ '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+ ));
+ }
if(strlen(get_config('system','directory_submit_url'))) {
$opt_tpl = load_view_file("view/profile-in-netdir.tpl");
@@ -288,10 +308,15 @@ function settings_content(&$a) {
$theme_selector = '