mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View File

@ -829,7 +829,7 @@ class acp_users
// Which updates do we need to do?
$update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false;
$update_password = ($data['new_password'] && !$passwords_manager->check($data['new_password'], $user_row['user_password'])) ? true : false;
$update_password = $data['new_password'] && !$passwords_manager->check($data['new_password'], $user_row['user_password']);
$update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false;
if (!sizeof($error))

5
phpBB/phpbb/passwords/driver/bcrypt.php
View File

@ -29,9 +29,8 @@ class bcrypt extends base
*/
public function hash($password, $salt = '')
{
// The 2x and 2y prefixes of bcrypt might not be supported
// Revert to 2a if this is the case
$prefix = (!$this->is_supported()) ? '$2a$' : $this->get_prefix();
// Get prefix of this driver
$prefix = $this->get_prefix();
// Do not support 8-bit characters with $2a$ bcrypt
// Also see http://www.php.net/security/crypt_blowfish.php

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);
}
/**

5
phpBB/phpbb/passwords/helper.php
View File

@ -26,10 +26,7 @@ class helper
*/
public function set_manager(\phpbb\passwords\manager $manager)
{
if ($this->manager === null)
{
$this->manager = $manager;
}
$this->manager = $manager;
}
/**