diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-12-29 16:33:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-12-29 16:33:09 +0100 |
| commit | 808c54fa89f556e6f4701d4f8c6c418393ddfc13 (patch) | |
| tree | 928d41159e537f59751e9fd5e3a08945c7174cf9 /phpBB/phpbb/passwords/driver/salted_md5.php | |
| parent | 555cd025b2d53e681dd02756f7de3ba0bf7df321 (diff) | |
| download | forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar.gz forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar.bz2 forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.tar.xz forums-808c54fa89f556e6f4701d4f8c6c418393ddfc13.zip | |
[feature/passwords] Get rid of unneeded code complexity
Simplified a little bit of code as pointed out by imkingdavid on github.
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/passwords/driver/salted_md5.php')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/salted_md5.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php index 08b0db29a0..72db8d200f 100644 --- a/phpBB/phpbb/passwords/driver/salted_md5.php +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -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); } /** |