diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-20 11:33:52 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-20 11:33:52 -0400 |
| commit | f4ca441148699a186918f6eea70bc3d44a65e6dc (patch) | |
| tree | be041c9cbb29defbb22fadb1a11c1e28396eaf32 | |
| parent | 5642e9fa388bb84027a7b71a3baeef39c3aafcab (diff) | |
| parent | 9df797299320cea01c541bb4997e498f915f98fa (diff) | |
| download | volse-hubzilla-f4ca441148699a186918f6eea70bc3d44a65e6dc.tar.gz volse-hubzilla-f4ca441148699a186918f6eea70bc3d44a65e6dc.tar.bz2 volse-hubzilla-f4ca441148699a186918f6eea70bc3d44a65e6dc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #339 - lostpass sending to username, not email
* master:
| -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); |