X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fprofilesettings.php;h=7d3143d4b186507483af83288750c910a220d45e;hb=f094918cf69fec48aa501b8ec0cfa4af87d11266;hp=71bc40ce9add95abfa53ebf42767ed0582880000;hpb=6ed66d9c7617332e9ea253e1f48583b4d9dbf45c;p=quix0rs-gnu-social.git diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 71bc40ce9a..7d3143d4b1 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -29,9 +29,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * Change profile settings @@ -72,7 +70,7 @@ class ProfilesettingsAction extends SettingsAction function showScripts() { parent::showScripts(); - $this->autofocus('nickname'); + $this->autofocus('fullname'); } /** @@ -84,8 +82,8 @@ class ProfilesettingsAction extends SettingsAction */ function showContent() { - $user = common_current_user(); - $profile = $user->getProfile(); + $profile = $this->scoped; + $user = $this->scoped->getUser(); $this->elementStart('form', array('method' => 'post', 'id' => 'form_settings_profile', @@ -102,9 +100,13 @@ class ProfilesettingsAction extends SettingsAction $this->elementStart('li'); // TRANS: Field label in form for profile settings. $this->input('nickname', _('Nickname'), - ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname, + $this->arg('nickname') ?: $profile->nickname, // TRANS: Tooltip for field label in form for profile settings. - _('1-64 lowercase letters or numbers, no punctuation or spaces.')); + _('1-64 lowercase letters or numbers, no punctuation or spaces.'), + null, false, // "name" (will be set to id), then "required" + !common_config('profile', 'changenick') + ? array('disabled' => 'disabled', 'placeholder' => null) + : array('placeholder' => null)); $this->elementEnd('li'); $this->elementStart('li'); // TRANS: Field label in form for profile settings. @@ -239,28 +241,30 @@ class ProfilesettingsAction extends SettingsAction if (Event::handle('StartProfileSaveForm', array($this))) { - $nickname = $this->trimmed('nickname'); - try { - $nickname = Nickname::normalize($nickname, true); - } catch (NicknameTakenException $e) { - // Abort only if the nickname is occupied by another local profile - if ($e->profile->id != $this->scoped->id) { + // $nickname will only be set if this changenick value is true. + if (common_config('profile', 'changenick') == true) { + try { + $nickname = Nickname::normalize($this->trimmed('nickname'), true); + } catch (NicknameTakenException $e) { + // Abort only if the nickname is occupied by another local profile + if ($e->profile->id != $this->scoped->id) { + $this->showForm($e->getMessage()); + return; + } + $nickname = Nickname::normalize($this->trimmed('nickname')); // without in-use check this time + } catch (NicknameException $e) { $this->showForm($e->getMessage()); return; } - $nickname = Nickname::normalize($nickname); // without in-use check this time - } catch (NicknameException $e) { - $this->showForm($e->getMessage()); - return; } $fullname = $this->trimmed('fullname'); $homepage = $this->trimmed('homepage'); $bio = $this->trimmed('bio'); $location = $this->trimmed('location'); - $autosubscribe = $this->boolean('autosubscribe'); + $autosubscribe = $this->booleanintstring('autosubscribe'); $subscribe_policy = $this->trimmed('subscribe_policy'); - $private_stream = $this->boolean('private_stream'); + $private_stream = $this->booleanintstring('private_stream'); $language = $this->trimmed('language'); $timezone = $this->trimmed('timezone'); $tagstring = $this->trimmed('tags'); @@ -320,70 +324,47 @@ class ProfilesettingsAction extends SettingsAction } $user = common_current_user(); - $user->query('BEGIN'); - if ($user->nickname != $nickname || - $user->language != $language || - $user->timezone != $timezone) { - - common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname, - __FILE__); - common_debug('Updating user language from ' . $user->language . ' to ' . $language, - __FILE__); - common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone, - __FILE__); - - $original = clone($user); - - $user->nickname = $nickname; - $user->language = $language; - $user->timezone = $timezone; - - $result = $user->updateKeys($original); - - if ($result === false) { - common_log_db_error($user, 'UPDATE', __FILE__); - // TRANS: Server error thrown when user profile settings could not be updated. - $this->serverError(_('Could not update user.')); - return; - } else { - // Re-initialize language environment if it changed - common_init_language(); - // Clear the site owner, in case nickname changed - if ($user->hasRole(Profile_role::OWNER)) { - User::blow('user:site_owner'); - } - } - } + // $user->nickname is updated through Profile->update(); // XXX: XOR - if (($user->autosubscribe ^ $autosubscribe) || - ($user->private_stream ^ $private_stream) || - ($user->subscribe_policy != $subscribe_policy)) { + if (($user->autosubscribe ^ $autosubscribe) + || ($user->private_stream ^ $private_stream) + || $user->timezone != $timezone + || $user->language != $language + || $user->subscribe_policy != $subscribe_policy) { $original = clone($user); $user->autosubscribe = $autosubscribe; + $user->language = $language; $user->private_stream = $private_stream; $user->subscribe_policy = $subscribe_policy; + $user->timezone = $timezone; $result = $user->update($original); - if ($result === false) { common_log_db_error($user, 'UPDATE', __FILE__); // TRANS: Server error thrown when user profile settings could not be updated to // TRANS: automatically subscribe to any subscriber. $this->serverError(_('Could not update user for autosubscribe or subscribe_policy.')); - return; } + + // Re-initialize language environment if it changed + common_init_language(); } $profile = $user->getProfile(); $orig_profile = clone($profile); - $profile->nickname = $user->nickname; + if (common_config('profile', 'changenick') == true && $profile->nickname !== $nickname) { + assert(Nickname::normalize($nickname)===$nickname); + common_debug("Changing user nickname from '{$profile->nickname}' to '{$nickname}'."); + $profile->nickname = $nickname; + $profile->profileurl = common_profile_url($profile->nickname); + } $profile->fullname = $fullname; $profile->homepage = $homepage; $profile->bio = $bio; @@ -403,8 +384,6 @@ class ProfilesettingsAction extends SettingsAction $profile->location_ns = $loc->location_ns; } - $profile->profileurl = common_profile_url($nickname); - if (common_config('location', 'share') == 'user') { $exists = false; @@ -421,7 +400,7 @@ class ProfilesettingsAction extends SettingsAction $orig = clone($prefs); } - $prefs->share_location = $this->boolean('sharelocation'); + $prefs->share_location = $this->booleanintstring('sharelocation'); if ($exists) { $result = $prefs->update($orig); @@ -433,7 +412,6 @@ class ProfilesettingsAction extends SettingsAction common_log_db_error($prefs, ($exists) ? 'UPDATE' : 'INSERT', __FILE__); // TRANS: Server error thrown when user profile location preference settings could not be updated. $this->serverError(_('Could not save location prefs.')); - return; } } @@ -446,7 +424,6 @@ class ProfilesettingsAction extends SettingsAction common_log_db_error($profile, 'UPDATE', __FILE__); // TRANS: Server error thrown when user profile settings could not be saved. $this->serverError(_('Could not save profile.')); - return; } // Set the user tags @@ -455,12 +432,10 @@ class ProfilesettingsAction extends SettingsAction if (!$result) { // TRANS: Server error thrown when user profile settings tags could not be saved. $this->serverError(_('Could not save tags.')); - return; } $user->query('COMMIT'); Event::handle('EndProfileSaveForm', array($this)); - common_broadcast_profile($profile); // TRANS: Confirmation shown when user profile settings are saved. $this->showForm(_('Settings saved.'), true);