diff options
| -rw-r--r-- | actions/profilesettings.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 359664096..acfcbcd00 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -69,7 +69,7 @@ class ProfilesettingsAction extends AccountSettingsAction function getInstructions() { return _('You can update your personal profile info here '. - 'so people know more about you.'); + 'so people know more about you.'); } function showScripts() @@ -92,9 +92,9 @@ class ProfilesettingsAction extends AccountSettingsAction $profile = $user->getProfile(); $this->elementStart('form', array('method' => 'post', - 'id' => 'form_settings_profile', - 'class' => 'form_settings', - 'action' => common_local_url('profilesettings'))); + 'id' => 'form_settings_profile', + 'class' => 'form_settings', + 'action' => common_local_url('profilesettings'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Profile information')); $this->hidden('token', common_session_token()); @@ -185,7 +185,7 @@ class ProfilesettingsAction extends AccountSettingsAction $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { $this->showForm(_('There was a problem with your session token. '. - 'Try again, please.')); + 'Try again, please.')); return; } @@ -203,15 +203,15 @@ class ProfilesettingsAction extends AccountSettingsAction // Some validation if (!Validate::string($nickname, array('min_length' => 1, - 'max_length' => 64, - 'format' => NICKNAME_FMT))) { + 'max_length' => 64, + 'format' => NICKNAME_FMT))) { $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.')); return; } else if (!User::allowed_nickname($nickname)) { $this->showForm(_('Not a valid nickname.')); return; } else if (!is_null($homepage) && (strlen($homepage) > 0) && - !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) { + !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) { $this->showForm(_('Homepage is not a valid URL.')); return; } else if (!is_null($fullname) && mb_strlen($fullname) > 255) { @@ -253,15 +253,15 @@ class ProfilesettingsAction extends AccountSettingsAction $user->query('BEGIN'); if ($user->nickname != $nickname || - $user->language != $language || - $user->timezone != $timezone) { + $user->language != $language || + $user->timezone != $timezone) { common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname, - __FILE__); + __FILE__); common_debug('Updating user language from ' . $user->language . ' to ' . $language, - __FILE__); + __FILE__); common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone, - __FILE__); + __FILE__); $original = clone($user); @@ -281,7 +281,7 @@ class ProfilesettingsAction extends AccountSettingsAction } } -// XXX: XOR + // XXX: XOR if ($user->autosubscribe ^ $autosubscribe) { $original = clone($user); @@ -351,7 +351,7 @@ class ProfilesettingsAction extends AccountSettingsAction $user = common_current_user(); $other = User::staticGet('nickname', $nickname); if (!$other) { - return false; + return false; } else { return $other->id != $user->id; } |