mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 10:40:28 +02:00
Code Issues Releases Wiki Activity

[feature/passwords] Get rid of unneeded code complexity

Browse Source 
Simplified a little bit of code as pointed out by imkingdavid on github.

PHPBB3-11610
This commit is contained in:
Marc Alexander
2013-12-29 16:33:09 +01:00
parent 555cd025b2
commit 808c54fa89
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/phpbb/passwords/driver/salted_md5.php
View File

@@ -57,7 +57,7 @@ class salted_md5 extends base
*/
public function hash($password, $setting = '')
{
if ($setting != '')
if ($setting)
{
if (($settings = $this->get_hash_settings($setting)) === false)
{
@@ -95,14 +95,10 @@ class salted_md5 extends base
{
if (strlen($hash) !== 34)
{
return (md5($password) === $hash) ? true : false;
return md5($password) === $hash;
}
if ($hash === $this->hash($password, $hash))
{
return true;
}
return false;
return $hash === $this->hash($password, $hash);
}
/**