X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fprofilesettings.php;h=7d3143d4b186507483af83288750c910a220d45e;hb=fd2efbc6f81aba67ff3776712af65b1a8fa73d06;hp=fbaddaa5f9cd04e6c61d5165be81dd944b94248d;hpb=1e73ba00bdd37f46415eb45b1b904dc894fb801c;p=quix0rs-gnu-social.git diff --git a/actions/profilesettings.php b/actions/profilesettings.php index fbaddaa5f9..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. @@ -150,7 +152,7 @@ class ProfilesettingsAction extends SettingsAction // TRANS: Checkbox label in form for profile settings. $this->checkbox('sharelocation', _('Share my current location when posting notices'), ($this->arg('sharelocation')) ? - $this->arg('sharelocation') : $user->shareLocation()); + $this->arg('sharelocation') : $this->scoped->shareLocation()); $this->elementEnd('li'); } Event::handle('EndProfileFormData', array($this)); @@ -185,7 +187,7 @@ class ProfilesettingsAction extends SettingsAction $this->checkbox('autosubscribe', // TRANS: Checkbox label in form for profile settings. _('Automatically subscribe to whoever '. - 'subscribes to me (best for non-humans).'), + 'subscribes to me (best for non-humans)'), ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe); $this->elementEnd('li'); @@ -239,31 +241,37 @@ class ProfilesettingsAction extends SettingsAction if (Event::handle('StartProfileSaveForm', array($this))) { - try { - $nickname = Nickname::normalize($this->trimmed('nickname')); - } catch (NicknameException $e) { - $this->showForm($e->getMessage()); - return; + // $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; + } } $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'); // Some validation - if (!User::allowed_nickname($nickname)) { - // TRANS: Validation error in form for profile settings. - $this->showForm(_('Not a valid nickname.')); - return; - } else if (!is_null($homepage) && (strlen($homepage) > 0) && - !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) { + if (!is_null($homepage) && (strlen($homepage) > 0) && + !common_valid_http_url($homepage)) { // TRANS: Validation error in form for profile settings. $this->showForm(_('Homepage is not a valid URL.')); return; @@ -288,96 +296,75 @@ class ProfilesettingsAction extends SettingsAction // TRANS: Validation error in form for profile settings. $this->showForm(_('Timezone not selected.')); return; - } else if ($this->nicknameExists($nickname)) { - // TRANS: Validation error in form for profile settings. - $this->showForm(_('Nickname already in use. Try another one.')); - return; } else if (!is_null($language) && strlen($language) > 50) { // TRANS: Validation error in form for profile settings. $this->showForm(_('Language is too long (maximum 50 characters).')); return; } - if ($tagstring) { - $tags = array_map('common_canonical_tag', preg_split('/[\s,]+/', $tagstring)); - } else { - $tags = array(); - } + $tags = array(); + $tag_priv = array(); + if (is_string($tagstring) && strlen($tagstring) > 0) { - foreach ($tags as $tag) { - if (!common_valid_profile_tag($tag)) { - // TRANS: Validation error in form for profile settings. - // TRANS: %s is an invalid tag. - $this->showForm(sprintf(_('Invalid tag: "%s".'), $tag)); - return; + $tags = preg_split('/[\s,]+/', $tagstring); + + foreach ($tags as &$tag) { + $private = @$tag[0] === '.'; + + $tag = common_canonical_tag($tag); + if (!common_valid_profile_tag($tag)) { + // TRANS: Validation error in form for profile settings. + // TRANS: %s is an invalid tag. + $this->showForm(sprintf(_('Invalid tag: "%s".'), $tag)); + return; + } + + $tag_priv[$tag] = $private; } } $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; @@ -397,13 +384,11 @@ class ProfilesettingsAction extends SettingsAction $profile->location_ns = $loc->location_ns; } - $profile->profileurl = common_profile_url($nickname); - if (common_config('location', 'share') == 'user') { $exists = false; - $prefs = User_location_prefs::staticGet('user_id', $user->id); + $prefs = User_location_prefs::getKV('user_id', $user->id); if (empty($prefs)) { $prefs = new User_location_prefs(); @@ -415,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); @@ -427,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; } } @@ -440,21 +424,18 @@ 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 - $result = $user->setSelfTags($tags); + $result = $user->setSelfTags($tags, $tag_priv); 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); @@ -462,17 +443,6 @@ class ProfilesettingsAction extends SettingsAction } } - function nicknameExists($nickname) - { - $user = common_current_user(); - $other = User::staticGet('nickname', $nickname); - if (!$other) { - return false; - } else { - return $other->id != $user->id; - } - } - function showAside() { $user = common_current_user();