diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-20 17:31:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-20 17:31:32 +0200 |
| commit | a00854c406215d787465422d7ea7def8c24180f5 (patch) | |
| tree | 0e8352afe2bdf9d6cca276668da2302fee89321d /phpBB/phpbb/passwords/driver | |
| parent | beafef00004007024d3c8c769d630d7d5ec9b698 (diff) | |
| download | forums-a00854c406215d787465422d7ea7def8c24180f5.tar forums-a00854c406215d787465422d7ea7def8c24180f5.tar.gz forums-a00854c406215d787465422d7ea7def8c24180f5.tar.bz2 forums-a00854c406215d787465422d7ea7def8c24180f5.tar.xz forums-a00854c406215d787465422d7ea7def8c24180f5.zip | |
[feature/passwords] Do not pass phpbb_container to passwords manager
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/passwords/driver')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/bcrypt.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/bcrypt_2y.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/interface.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/phpass.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/salted_md5.php | 8 |
5 files changed, 0 insertions, 39 deletions
diff --git a/phpBB/phpbb/passwords/driver/bcrypt.php b/phpBB/phpbb/passwords/driver/bcrypt.php index 2c2ab8e7b7..db41fe6b38 100644 --- a/phpBB/phpbb/passwords/driver/bcrypt.php +++ b/phpBB/phpbb/passwords/driver/bcrypt.php @@ -33,14 +33,6 @@ class phpbb_passwords_driver_bcrypt extends phpbb_passwords_driver_base /** * @inheritdoc */ - public function get_type() - { - return get_class($this); - } - - /** - * @inheritdoc - */ public function hash($password, $salt = '') { // The 2x and 2y prefixes of bcrypt might not be supported diff --git a/phpBB/phpbb/passwords/driver/bcrypt_2y.php b/phpBB/phpbb/passwords/driver/bcrypt_2y.php index 9277414d13..5b0dbdd311 100644 --- a/phpBB/phpbb/passwords/driver/bcrypt_2y.php +++ b/phpBB/phpbb/passwords/driver/bcrypt_2y.php @@ -33,14 +33,6 @@ class phpbb_passwords_driver_bcrypt_2y extends phpbb_passwords_driver_bcrypt /** * @inheritdoc */ - public function get_type() - { - return get_class($this); - } - - /** - * @inheritdoc - */ public function is_supported() { return (version_compare(PHP_VERSION, '5.3.7', '<')) ? false : true; diff --git a/phpBB/phpbb/passwords/driver/interface.php b/phpBB/phpbb/passwords/driver/interface.php index a019830cb4..a2088db81c 100644 --- a/phpBB/phpbb/passwords/driver/interface.php +++ b/phpBB/phpbb/passwords/driver/interface.php @@ -34,13 +34,6 @@ interface phpbb_passwords_driver_interface public function get_prefix(); /** - * Returns the name of the hash type - * - * @return string Hash type of driver - */ - public function get_type(); - - /** * Hash the password * * @return string Password hash diff --git a/phpBB/phpbb/passwords/driver/phpass.php b/phpBB/phpbb/passwords/driver/phpass.php index 14ba60f279..d52ce96d11 100644 --- a/phpBB/phpbb/passwords/driver/phpass.php +++ b/phpBB/phpbb/passwords/driver/phpass.php @@ -29,12 +29,4 @@ class phpbb_passwords_driver_phpass extends phpbb_passwords_driver_salted_md5 { return self::PREFIX; } - - /** - * @inheritdoc - */ - public function get_type() - { - return get_class($this); - } } diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php index b87daae4e3..6fa12948be 100644 --- a/phpBB/phpbb/passwords/driver/salted_md5.php +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -33,14 +33,6 @@ class phpbb_passwords_driver_salted_md5 extends phpbb_passwords_driver_base /** * @inheritdoc */ - public function get_type() - { - return get_class($this); - } - - /** - * @inheritdoc - */ public function hash($password, $setting = '') { if ($setting != '') |