mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/passwords] Get rid of set_name/get_name methods for passwords drivers

Browse Source 
PHPBB3-11610
This commit is contained in:
Marc Alexander
2014-02-02 14:09:09 +01:00
parent 85f1e8afa5
commit 292961a277
10 changed files with 8 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/config/passwords.yml
View File

@@ -11,8 +11,6 @@ services:
arguments:
- @config
- @passwords.driver_helper
calls:
- [set_name, [passwords.driver.bcrypt]]
tags:
- { name: passwords.driver }
@@ -21,8 +19,6 @@ services:
arguments:
- @config
- @passwords.driver_helper
calls:
- [set_name, [passwords.driver.bcrypt_2y]]
tags:
- { name: passwords.driver }
@@ -31,8 +27,6 @@ services:
arguments:
- @config
- @passwords.driver_helper
calls:
- [set_name, [passwords.driver.salted_md5]]
tags:
- { name: passwords.driver }
@@ -41,8 +35,6 @@ services:
arguments:
- @config
- @passwords.driver_helper
calls:
- [set_name, [passwords.driver.phpass]]
tags:
- { name: passwords.driver }

18
phpBB/phpbb/passwords/driver/base.php
View File

@@ -42,22 +42,4 @@ abstract class base implements driver_interface
{
return true;
}
/**
* @inheritdoc
*/
public function get_name()
{
return $this->name;
}
/**
* Set driver name
*
* @param string $name Driver name
*/
public function set_name($name)
{
$this->name = $name;
}
}

7
phpBB/phpbb/passwords/driver/driver_interface.php
View File

@@ -57,11 +57,4 @@ interface driver_interface
* @return string String containing the hash settings
*/
public function get_settings_only($hash, $full = false);
/**
* Get the driver name
*
* @return string Driver name
*/
public function get_name();
}

20
phpBB/phpbb/passwords/manager.php
View File

@@ -79,7 +79,7 @@ class manager
{
if ($this->algorithms[$type]->is_supported())
{
$this->type = $type;
$this->type = $this->algorithms[$type]->get_prefix();
break;
}
}
@@ -94,16 +94,12 @@ class manager
{
foreach ($hashing_algorithms as $algorithm)
{
if (!isset($this->algorithms[$algorithm->get_name()]))
{
$this->algorithms[$algorithm->get_name()] = $algorithm;
}
if (!isset($this->type_map[$algorithm->get_prefix()]))
{
$this->type_map[$algorithm->get_prefix()] = $algorithm->get_name();
$this->type_map[$algorithm->get_prefix()] = $algorithm;
}
}
$this->algorithms = $hashing_algorithms;
}
/**
@@ -130,9 +126,9 @@ class manager
*/
protected function get_algorithm($prefix)
{
if (isset($this->type_map[$prefix]) && isset($this->algorithms[$this->type_map[$prefix]]))
if (isset($this->type_map[$prefix]))
{
return $this->algorithms[$this->type_map[$prefix]];
return $this->type_map[$prefix];
}
else
{
@@ -216,9 +212,9 @@ class manager
return $this->helper->combined_hash_password($password, $type);
}
if (isset($this->algorithms[$type]))
if (isset($this->type_map[$type]))
{
$hashing_algorithm = $this->algorithms[$type];
$hashing_algorithm = $this->type_map[$type];
}
else
{
@@ -260,7 +256,7 @@ class manager
return $correct;
}
if ($stored_hash_type->get_name() !== $this->type)
if ($stored_hash_type->get_prefix() !== $this->type)
{
$this->convert_flag = true;
}