} else if ($this->arg('reset')) {
$this->reset_password();
} else {
- $this->client_error(_('Unexpected form.'));
+ $this->client_error(_('Unexpected form submission.'));
}
} else {
if ($this->trimmed('code')) {
}
$touched = strtotime($confirm->modified);
+ $email = $confirm->address;
# Burn this code
return;
}
+ # If we used an outstanding confirmation to send the email,
+ # it's been confirmed at this point.
+
+ if (!$user->email) {
+ $orig = clone($user);
+ $user->email = $email;
+ $result = $user->updateKeys($orig);
+ if (!$result) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ $this->server_error(_('Could not update user with confirmed email address.'));
+ return;
+ }
+ }
+
# Success!
$this->set_temp_user($user);
} else {
common_element('div', 'instructions',
_('If you\'ve forgotten or lost your' .
- ' password, you can get a new one sent ' .
+ ' password, you can get a new one sent to' .
' the email address you have stored ' .
' in your account.'));
}
$this->show_form(_('Enter a nickname or email address.'));
return;
}
+
$user = User::staticGet('email', common_canonical_email($nore));
+
if (!$user) {
$user = User::staticGet('nickname', common_canonical_nickname($nore));
}
+ # See if it's an unconfirmed email address
+
if (!$user) {
- $this->show_form(_('No such user.'));
+ $confirm_email = Confirm_address::staticGet('address', common_canonical_email($nore));
+ if ($confirm_email && $confirm_email->address_type == 'email') {
+ $user = User::staticGet($confirm_email->user_id);
+ }
+ }
+
+ if (!$user) {
+ $this->show_form(_('No user with that email address or username.'));
return;
}
- if (!$user->email) {
+
+ # Try to get an unconfirmed email address if they used a user name
+
+ if (!$user->email && !$confirm_email) {
+ $confirm_email = Confirm_address::staticGet('user_id', $user->id);
+ if ($confirm_email && $confirm_email->address_type != 'email') {
+ # Skip non-email confirmations
+ $confirm_email = NULL;
+ }
+ }
+
+ if (!$user->email && !$confirm_email) {
$this->client_error(_('No registered email address for that user.'));
return;
}
+ # Success! We have a valid user and a confirmed or unconfirmed email address
+
$confirm = new Confirm_address();
$confirm->code = common_confirmation_code(128);
$confirm->address_type = 'recover';
$confirm->user_id = $user->id;
- $confirm->address = $user->email;
+ $confirm->address = (isset($user->email)) ? $user->email : $confirm_email->address;
if (!$confirm->insert()) {
common_log_db_error($confirm, 'INSERT', __FILE__);
$body .= common_config('site', 'name');
$body .= "\n";
- mail_to_user($user, _('Password recovery requested'), $body);
+ mail_to_user($user, _('Password recovery requested'), $body, $confirm->address);
common_show_header(_('Password recovery requested'));
common_element('p', NULL,