messages.po and and corrected typo in comment

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 150c170d7a47b53bae77ca428e7a523bde016db6..f840f2fb62beb1d23f4d1cbb5a4887ad3c3d6e9d 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -34,7 +34,7 @@ function lostpass_post(App $a)
                DI::baseUrl()->redirect();
        }
 
-       $condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
+       $condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0 AND `account_removed` = 0 AND `account_expired` = 0', $loginame, $loginame];
        $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'language'], $condition);
        if (!DBA::isResult($user)) {
                DI::sysmsg()->addNotice(DI::l10n()->t('No valid account found.'));
@@ -49,7 +49,7 @@ function lostpass_post(App $a)
        ];
        $result = DBA::update('user', $fields, ['uid' => $user['uid']]);
        if ($result) {
-               info(DI::l10n()->t('Password reset request issued. Check your email.'));
+               DI::sysmsg()->addInfo(DI::l10n()->t('Password reset request issued. Check your email.'));
        }
 
        $sitename = DI::config()->get('config', 'sitename');
@@ -152,7 +152,7 @@ function lostpass_generate_password($user)
                        '$newpass' => $new_password,
                ]);
 
-               info(DI::l10n()->t("Your password has been reset."));
+               DI::sysmsg()->addInfo(DI::l10n()->t("Your password has been reset."));
 
                $sitename = DI::config()->get('config', 'sitename');
                $preamble = Strings::deindent(DI::l10n()->t('