X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Frecoverpassword.php;h=a3a5b8e5bc6ea41b4c52792296070f9e577b2c92;hb=bdc38a7204dc83e17b5a251a568447b8e23d533e;hp=9019d6fb227359ba0b17c37801577e8458462b4f;hpb=061c8d959ba8351b145a27690d5a4caa477915ca;p=quix0rs-gnu-social.git diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index 9019d6fb22..a3a5b8e5bc 100644 --- a/actions/recoverpassword.php +++ b/actions/recoverpassword.php @@ -19,7 +19,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -# You have 24 hours to claim your password +// You have 24 hours to claim your password define('MAX_RECOVERY_TIME', 24 * 60 * 60); @@ -35,7 +35,6 @@ class RecoverpasswordAction extends Action if (common_logged_in()) { // TRANS: Client error displayed trying to recover password while already logged in. $this->clientError(_('You are already logged in!')); - return; } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('recover')) { $this->recoverPassword(); @@ -57,31 +56,28 @@ class RecoverpasswordAction extends Action function checkCode() { $code = $this->trimmed('code'); - $confirm = Confirm_address::staticGet('code', $code); + $confirm = Confirm_address::getKV('code', $code); if (!$confirm) { // TRANS: Client error displayed when password recovery code is not correct. $this->clientError(_('No such recovery code.')); - return; } if ($confirm->address_type != 'recover') { // TRANS: Client error displayed when no proper password recovery code was submitted. $this->clientError(_('Not a recovery code.')); - return; } - $user = User::staticGet($confirm->user_id); + $user = User::getKV($confirm->user_id); if (!$user) { // TRANS: Server error displayed trying to recover password without providing a user. $this->serverError(_('Recovery code for unknown user.')); - return; } $touched = strtotime($confirm->modified); $email = $confirm->address; - # Burn this code + // Burn this code $result = $confirm->delete(); @@ -89,11 +85,10 @@ class RecoverpasswordAction extends Action common_log_db_error($confirm, 'DELETE', __FILE__); // TRANS: Server error displayed removing a password recovery code from the database. $this->serverError(_('Error with confirmation code.')); - return; } - # These should be reaped, but for now we just check mod time - # Note: it's still deleted; let's avoid a second attempt! + // These should be reaped, but for now we just check mod time + // Note: it's still deleted; let's avoid a second attempt! if ((time() - $touched) > MAX_RECOVERY_TIME) { common_log(LOG_WARNING, @@ -102,25 +97,19 @@ class RecoverpasswordAction extends Action // TRANS: Client error displayed trying to recover password with too old a recovery code. $this->clientError(_('This confirmation code is too old. ' . 'Please start again.')); - return; } - # If we used an outstanding confirmation to send the email, - # it's been confirmed at this point. + // 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__); - // TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password. - $this->serverError(_('Could not update user with confirmed email address.')); - return; - } + // Throws exception on failure. + $user->updateWithKeys($orig); } - # Success! + // Success! $this->setTempUser($user); $this->showPasswordForm(); @@ -137,7 +126,7 @@ class RecoverpasswordAction extends Action common_ensure_session(); $user_id = $_SESSION['tempuser']; if ($user_id) { - $user = User::staticGet($user_id); + $user = User::getKV($user_id); } return $user; } @@ -162,8 +151,8 @@ class RecoverpasswordAction extends Action ' the email address you have stored' . ' in your account.')); } else if ($this->mode == 'reset') { - // TRANS: Page notice for password change page. $this->element('p', null, + // TRANS: Page notice for password change page. _('You have been identified. Enter a' . ' new password below.')); } @@ -260,7 +249,7 @@ class RecoverpasswordAction extends Action $this->elementStart('li'); // TRANS: Field label for password reset form where the password has to be typed again. $this->password('confirm', _('Confirm'), - // TRANS: Ttile for field label for password reset form where the password has to be typed again. + // TRANS: Title for field label for password reset form where the password has to be typed again. _('Same as password above.')); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -273,110 +262,37 @@ class RecoverpasswordAction extends Action function recoverPassword() { $nore = $this->trimmed('nicknameoremail'); + if (!$nore) { // TRANS: Form instructions for password recovery form. $this->showForm(_('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) { - // Warning: it may actually be legit to have multiple folks - // who have claimed, but not yet confirmed, the same address. - // We'll only send to the first one that comes up. - $confirm_email = new Confirm_address(); - $confirm_email->address = common_canonical_email($nore); - $confirm_email->address_type = 'email'; - $confirm_email->find(); - if ($confirm_email->fetch()) { - $user = User::staticGet($confirm_email->user_id); + try { + User::recoverPassword($nore); + $this->mode = 'sent'; + if (common_is_email($nore) && common_config('site', 'fakeaddressrecovery')) { + // TRANS: User notification when recovering password by giving email address, + // regardless if the mail was sent or not (to hide registered email status). + $this->msg = _('If the email address you provided was found in the database, a recovery mail with instructions has been sent there.'); } else { - $confirm_email = null; - } - } else { - $confirm_email = null; - } - - if (!$user) { - // TRANS: Information on password recovery form if no known username or e-mail address was specified. - $this->showForm(_('No user with that email address or username.')); - return; - } - - # Try to get an unconfirmed email address if they used a user name - - if (!$user->email && !$confirm_email) { - $confirm_email = new Confirm_address(); - $confirm_email->user_id = $user->id; - $confirm_email->address_type = 'email'; - $confirm_email->find(); - if (!$confirm_email->fetch()) { - $confirm_email = null; + // TRANS: User notification after an e-mail with instructions was sent from the password recovery form. + $this->msg = _('Instructions for recovering your password ' . + 'have been sent to the email address registered to your ' . + 'account.'); } + $this->success = true; + } catch (Exception $e) { + $this->success = false; + $this->msg = $e->getMessage(); } - - if (!$user->email && !$confirm_email) { - // TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address. - $this->clientError(_('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 = (!empty($user->email)) ? $user->email : $confirm_email->address; - - if (!$confirm->insert()) { - common_log_db_error($confirm, 'INSERT', __FILE__); - // TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form. - $this->serverError(_('Error saving address confirmation.')); - return; - } - - // @todo FIXME: needs i18n. - $body = "Hey, $user->nickname."; - $body .= "\n\n"; - $body .= 'Someone just asked for a new password ' . - 'for this account on ' . common_config('site', 'name') . '.'; - $body .= "\n\n"; - $body .= 'If it was you, and you want to confirm, use the URL below:'; - $body .= "\n\n"; - $body .= "\t".common_local_url('recoverpassword', - array('code' => $confirm->code)); - $body .= "\n\n"; - $body .= 'If not, just ignore this message.'; - $body .= "\n\n"; - $body .= 'Thanks for your time, '; - $body .= "\n"; - $body .= common_config('site', 'name'); - $body .= "\n"; - - $headers = _mail_prepare_headers('recoverpassword', $user->nickname, $user->nickname); - // TRANS: Subject for password recovery e-mail. - mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address); - - $this->mode = 'sent'; - // TRANS: User notification after an e-mail with instructions was sent from the password recovery form. - $this->msg = _('Instructions for recovering your password ' . - 'have been sent to the email address registered to your ' . - 'account.'); - $this->success = true; $this->showPage(); } function resetPassword() { - # CSRF protection + // CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { // TRANS: Form validation error message. @@ -389,7 +305,6 @@ class RecoverpasswordAction extends Action if (!$user) { // TRANS: Client error displayed when trying to reset as password without providing a user. $this->clientError(_('Unexpected password reset.')); - return; } $newpassword = $this->trimmed('newpassword'); @@ -406,25 +321,14 @@ class RecoverpasswordAction extends Action return; } - # OK, we're ready to go - - $original = clone($user); - - $user->password = common_munge_password($newpassword, $user->id); - - if (!$user->update($original)) { - common_log_db_error($user, 'UPDATE', __FILE__); - // TRANS: Reset password form validation error message. - $this->serverError(_('Cannot save new password.')); - return; - } + // OK, we're ready to go + $user->setPassword($newpassword); $this->clearTempUser(); if (!common_set_user($user->nickname)) { // TRANS: Server error displayed when something does wrong with the user object during password reset. $this->serverError(_('Error setting user.')); - return; } common_real_login(true); @@ -436,4 +340,18 @@ class RecoverpasswordAction extends Action $this->success = true; $this->showPage(); } + + /** + * A local menu + * + * Shows different login/register actions. + * + * @return void + */ + + function showLocalNav() + { + $nav = new LoginGroupNav($this); + $nav->show(); + } }