X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fsettings.php;h=ebe07612eb1fa152a0a5d6c74ec60ec15e8c73cf;hb=fecef140d5181348e1f46cf8405f13bb05401b3e;hp=000258db917cea6ed5230649c838ffbd1d9b0f01;hpb=c5cf9de32a247bbb1757b1f8e30ab3483544fa31;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 000258db91..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)) {
@@ -117,11 +127,16 @@ function settings_post(&$a) {
// If openid has changed or if there's an openid but no openidserver, try and discover it.
if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
- logger('updating openidserver');
- require_once('library/openid.php');
- $open_id_obj = new LightOpenID;
- $open_id_obj->identity = $openid;
- $openidserver = $open_id_obj->discover($open_id_obj->identity);
+ $tmp_str = $openid;
+ if(strlen($tmp_str) && validate_url($tmp_str)) {
+ logger('updating openidserver');
+ require_once('library/openid.php');
+ $open_id_obj = new LightOpenID;
+ $open_id_obj->identity = $openid;
+ $openidserver = $open_id_obj->discover($open_id_obj->identity);
+ }
+ else
+ $openidserver = '';
}
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s' WHERE `uid` = %d LIMIT 1",
@@ -153,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;
@@ -193,7 +215,7 @@ function settings_content(&$a) {
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
if(! count($r))
- notice('No Plugin settings configured');
+ notice( t('No Plugin settings configured') . EOL);
call_hooks('plugin_settings', $o);
$o .= '';
@@ -242,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");
@@ -283,10 +308,15 @@ function settings_content(&$a) {
$theme_selector = '