_('1-64 lowercase letters or numbers, no punctuation or spaces'));
common_input('fullname', _('Full name'),
($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
- common_input('email', _('Email address'),
- ($this->arg('email')) ? $this->arg('email') : $user->email,
- _('Used only for updates, announcements, and password recovery'));
common_input('homepage', _('Homepage'),
($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
_('URL of your homepage, blog, or profile on another site'));
common_input('location', _('Location'),
($this->arg('location')) ? $this->arg('location') : $profile->location,
_('Where you are, like "City, State (or Region), Country"'));
+
+ $language = common_language();
+ common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), TRUE, $language);
+ $timezone = common_timezone();
+ $timezones = array();
+ foreach(DateTimeZone::listIdentifiers() as $k => $v) {
+ $timezones[$v] = $v;
+ }
+ common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), TRUE, $timezone);
+
+ common_checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
+ ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
common_submit('submit', _('Save'));
common_element_end('form');
common_show_footer();
$nickname = $this->trimmed('nickname');
$fullname = $this->trimmed('fullname');
- $email = $this->trimmed('email');
$homepage = $this->trimmed('homepage');
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
+ $autosubscribe = $this->boolean('autosubscribe');
+ $language = $this->trimmed('language');
+ $timezone = $this->trimmed('timezone');
# Some validation
- if ($email && !Validate::email($email, true)) {
- $this->show_form(_('Not a valid email address.'));
- return;
- } else if (!Validate::string($nickname, array('min_length' => 1,
- 'max_length' => 64,
- 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
- $this->show_form(_('Nickname must have only letters and numbers and no spaces.'));
+ if (!Validate::string($nickname, array('min_length' => 1,
+ 'max_length' => 64,
+ 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
+ $this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
} else if (!User::allowed_nickname($nickname)) {
$this->show_form(_('Not a valid nickname.'));
$this->show_form(_('Homepage is not a valid URL.'));
return;
} else if (!is_null($fullname) && strlen($fullname) > 255) {
- $this->show_form(_('Fullname is too long (max 255 chars).'));
+ $this->show_form(_('Full name is too long (max 255 chars).'));
return;
} else if (!is_null($bio) && strlen($bio) > 140) {
$this->show_form(_('Bio is too long (max 140 chars).'));
} else if (!is_null($location) && strlen($location) > 255) {
$this->show_form(_('Location is too long (max 255 chars).'));
return;
- } else if ($this->nickname_exists($nickname)) {
- $this->show_form(_('Nickname already exists.'));
+ } else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
+ $this->show_form(_('Timezone not selected.'));
return;
- } else if ($this->email_exists($email)) {
- $this->show_form(_('Email address already exists.'));
+ } else if ($this->nickname_exists($nickname)) {
+ $this->show_form(_('Nickname already in use. Try another one.'));
return;
+ } else if (!is_null($language) && strlen($language) > 50) {
+ $this->show_form(_('Language is too long (max 50 chars).'));
}
$user = common_current_user();
$user->query('BEGIN');
- if ($user->nickname != $nickname) {
+ 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__);
- common_server_error(_('Couldnt update user.'));
+ common_server_error(_('Couldn\'t update user.'));
return;
}
}
- if ($user->email != $email) {
-
- common_debug('Updating user email from ' . $user->email . ' to ' . $email,
- __FILE__);
-
- # We don't update email directly; it gets done by confirmemail
-
- $confirm = new Confirm_address();
+ # XXX: XOR
+
+ if ($user->autosubscribe ^ $autosubscribe) {
+
+ $original = clone($user);
- $confirm->code = common_confirmation_code(128);
- $confirm->user_id = $user->id;
- $confirm->address = $email;
- $confirm->address_type = 'email';
+ $user->autosubscribe = $autosubscribe;
- $result = $confirm->insert();
+ $result = $user->update($original);
- if (!$result) {
- common_log_db_error($confirm, 'INSERT', __FILE__);
- common_server_error(_('Couldnt confirm email.'));
- return FALSE;
+ if ($result === FALSE) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ common_server_error(_('Couldn\'t update user for autosubscribe.'));
+ return;
}
-
- # XXX: try not to do this in the middle of a transaction
-
- mail_confirm_address($confirm->code,
- $profile->nickname,
- $email);
}
-
+
$profile = $user->getProfile();
$orig_profile = clone($profile);
if (!$result) {
common_log_db_error($profile, 'UPDATE', __FILE__);
- common_server_error(_('Couldnt save profile.'));
+ common_server_error(_('Couldn\'t save profile.'));
return;
}
return $other->id != $user->id;
}
}
-
- function email_exists($email) {
- $user = common_current_user();
- $other = User::staticGet('email', $email);
- if (!$other) {
- return false;
- } else {
- return $other->id != $user->id;
- }
- }
}
projects / quix0rs-gnu-social.git / blobdiff