diff options
| author | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
| commit | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (patch) | |
| tree | dd2eff7d2870ee2c292fd39e69cdaa5a0a9b2fdb /mod/lostpass.php | |
| parent | cf347664165f97b5262d15464bbb169cbdb4ddd4 (diff) | |
| parent | efd7c14c24aa45878ddc412413ea1593cafcd651 (diff) | |
| download | volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.gz volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.bz2 volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/lostpass.php')
| -rwxr-xr-x | mod/lostpass.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mod/lostpass.php b/mod/lostpass.php index b71398fa4..57e6d6965 100755 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -3,13 +3,13 @@ function lostpass_post(&$a) { - $email = notags(trim($_POST['login-name'])); - if(! $email) + $loginame = notags(trim($_POST['login-name'])); + if(! $loginame) goaway(z_root()); $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1", - dbesc($email), - dbesc($email) + dbesc($loginame), + dbesc($loginame) ); if(! count($r)) { @@ -19,6 +19,7 @@ function lostpass_post(&$a) { $uid = $r[0]['uid']; $username = $r[0]['username']; + $email = $r[0]['email']; $new_password = autoname(12) . mt_rand(100,9999); $new_password_encoded = hash('whirlpool',$new_password); |