kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace _password_verify with password_verify 

PHP's password_verify function does know how to recognize md5 hashes: a custom
check is not necessary.
This commit is contained in:
Kienan Stewart 2018-04-15 19:02:32 -04:00
parent 6084650181
commit b5382bb13b
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bureau/class/functions.php
View File

@ -541,20 +541,6 @@ function _md5cr($pass, $salt = "") {
return crypt($pass, $salt);
}
/**
* Transtional function to check if a string matches a saved password hash.
* @param string $pass string
* @param string $hash string
* @return bool
*/
function _password_verify($pass, $hash) {
if (strncmp($hash, '$1$', 3) == 0) {
// @TODO Raise a warning for the user to update their password.
return _md5cr($pass, $hash) == $hash;
}
return password_verify($pass, $hash);
}
/** split mysql database name between username and custom database name
* @param string $dbname database name
* @return array returns username as first element, custom name as second

4
bureau/class/m_mem.php
View File

@ -93,7 +93,7 @@ class m_mem {
return false;
}
$db->next_record();
if (!_password_verify($password, $db->f('pass'))) {
if (!password_verify($password, $db->f('pass'))) {
$db->query("UPDATE membres SET lastfail=lastfail+1 WHERE uid= ? ;", array($db->f("uid")));
$msg->raise("ERROR", "mem", _("User or password incorrect"));
return false;
@ -396,7 +396,7 @@ class m_mem {
$msg->raise("ERROR", "mem", _("You are not allowed to change your password."));
return false;
}
if (!_password_verify($oldpass, $this->user['pass'])) {
if (!password_verify($oldpass, $this->user['pass'])) {
$msg->raise("ERROR", "mem", _("The old password is incorrect"));
return false;
}