wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use an outstanding unconfirmed email address for password recovery if available

Browse Source 
darcs-hash:20080804130914-84dde-77e1683ec76b26e9a3838d82cbe7827246db22dd.gz
This commit is contained in:
Evan Prodromou 2008-08-04 09:09:14 -04:00
parent 222b974b23
commit 506843e55d
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
actions/recoverpassword.php
View File

@ -69,6 +69,7 @@ class RecoverpasswordAction extends Action {
} }
$touched = strtotime($confirm->modified); $touched = strtotime($confirm->modified);
$email = $confirm->address;
# Burn this code # Burn this code
@ -89,6 +90,20 @@ class RecoverpasswordAction extends Action {
return; 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! # Success!
$this->set_temp_user($user); $this->set_temp_user($user);
@ -176,16 +191,26 @@ class RecoverpasswordAction extends Action {
$this->show_form(_('Enter a nickname or email address.')); $this->show_form(_('Enter a nickname or email address.'));
return; return;
} }
$user = User::staticGet('email', common_canonical_email($nore)); $user = User::staticGet('email', common_canonical_email($nore));
if (!$user) { if (!$user) {
$user = User::staticGet('nickname', common_canonical_nickname($nore)); $user = User::staticGet('nickname', common_canonical_nickname($nore));
} }
if (!$user) { 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; return;
} }
if (!$user->email) {
if (!$user->email && !$confirm_email) {
$this->client_error(_('No registered email address for that user.')); $this->client_error(_('No registered email address for that user.'));
return; return;
} }
@ -194,7 +219,7 @@ class RecoverpasswordAction extends Action {
$confirm->code = common_confirmation_code(128); $confirm->code = common_confirmation_code(128);
$confirm->address_type = 'recover'; $confirm->address_type = 'recover';
$confirm->user_id = $user->id; $confirm->user_id = $user->id;
$confirm->address = $user->email; $confirm->address = ($user->email) ? $user->email : $confirm_email->address;
if (!$confirm->insert()) { if (!$confirm->insert()) {
common_log_db_error($confirm, 'INSERT', __FILE__); common_log_db_error($confirm, 'INSERT', __FILE__);