clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  bug #339 - lostpass sending to username, not email

* master:
This commit is contained in:
Simon L'nu 2012-03-20 11:33:52 -04:00
parent 5642e9fa38 9df7972993
commit f4ca441148
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/lostpass.php
View File

@ -3,13 +3,13 @@
function lostpass_post(&$a) { function lostpass_post(&$a) {
$email = notags(trim($_POST['login-name'])); $loginame = notags(trim($_POST['login-name']));
if(! $email) if(! $loginame)
goaway(z_root()); goaway(z_root());
$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
dbesc($email), dbesc($loginame),
dbesc($email) dbesc($loginame)
); );
if(! count($r)) { if(! count($r)) {
@ -19,6 +19,7 @@ function lostpass_post(&$a) {
$uid = $r[0]['uid']; $uid = $r[0]['uid'];
$username = $r[0]['username']; $username = $r[0]['username'];
$email = $r[0]['email'];
$new_password = autoname(12) . mt_rand(100,9999); $new_password = autoname(12) . mt_rand(100,9999);
$new_password_encoded = hash('whirlpool',$new_password); $new_password_encoded = hash('whirlpool',$new_password);