Empty commit

This commit is contained in:
Git 2012-08-21 08:00:17 +00:00
parent 2310093877
commit fc62722ff9

View File

@ -32,14 +32,15 @@
// User has entered a new password, use step 2 // User has entered a new password, use step 2
$DB->query("SELECT $DB->query("SELECT
m.ID, m.ID,
m.Email, m.Email,
m.ipcc,
i.ResetExpires i.ResetExpires
FROM users_main AS m FROM users_main AS m
INNER JOIN users_info AS i ON i.UserID=m.ID INNER JOIN users_info AS i ON i.UserID=m.ID
WHERE i.ResetKey='".db_string($_REQUEST['key'])."' WHERE i.ResetKey='".db_string($_REQUEST['key'])."'
AND i.ResetKey<>'' AND i.ResetKey<>''
AND m.Enabled='1'"); AND m.Enabled='1'");
list($UserID,$Email,$Expires)=$DB->next_record(); list($UserID,$Email,$Country,$Expires)=$DB->next_record();
if ($UserID && strtotime($Expires)>time()) { if ($UserID && strtotime($Expires)>time()) {
// If the user has requested a password change, and his key has not expired // If the user has requested a password change, and his key has not expired
@ -63,7 +64,8 @@
WHERE m.ID='".db_string($UserID)."' WHERE m.ID='".db_string($UserID)."'
AND i.UserID=m.ID"); AND i.UserID=m.ID");
$Reset = true; // Past tense form of "to reset", meaning that password has now been reset $Reset = true; // Past tense form of "to reset", meaning that password has now been reset
}
}
} }
// Either a form asking for them to enter the password // Either a form asking for them to enter the password