X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flostpass.php;h=166da25fc24b56b494ac60eea109dcf40e8725a0;hb=1ec5c6b2840cedbe21e089f4ef4404d22a65031e;hp=e4204c4f89c9dd6c4e380019a2ffb261745c2cfa;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git diff --git a/mod/lostpass.php b/mod/lostpass.php index e4204c4f89..166da25fc2 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -23,8 +23,8 @@ function lostpass_post(App $a) } $condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame]; - $user = DBA::selectFirst('user', ['uid', 'username', 'email'], $condition); - if (!DBA::is_result($user)) { + $user = DBA::selectFirst('user', ['uid', 'username', 'email', 'language'], $condition); + if (!DBA::isResult($user)) { notice(L10n::t('No valid account found.') . EOL); goaway(System::baseUrl()); } @@ -69,6 +69,8 @@ function lostpass_post(App $a) notification([ 'type' => SYSTEM_EMAIL, + 'language' => $user['language'], + 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], 'subject' => L10n::t('Password reset requested at %s', $sitename), @@ -85,8 +87,8 @@ function lostpass_content(App $a) if ($a->argc > 1) { $pwdreset_token = $a->argv[1]; - $user = DBA::selectFirst('user', ['uid', 'username', 'email', 'pwdreset_time'], ['pwdreset' => $pwdreset_token]); - if (!DBA::is_result($user)) { + $user = DBA::selectFirst('user', ['uid', 'username', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]); + if (!DBA::isResult($user)) { notice(L10n::t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.")); return lostpass_form(); @@ -131,7 +133,7 @@ function lostpass_generate_password($user) $new_password = User::generateNewPassword(); $result = User::updatePassword($user['uid'], $new_password); - if (DBA::is_result($result)) { + if (DBA::isResult($result)) { $tpl = get_markup_template('pwdreset.tpl'); $o .= replace_macros($tpl, [ '$lbl1' => L10n::t('Password Reset'), @@ -165,6 +167,8 @@ function lostpass_generate_password($user) notification([ 'type' => SYSTEM_EMAIL, + 'language' => $user['language'], + 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], 'subject' => L10n::t('Your password has been changed at %s', $sitename),