diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-06 07:00:30 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-06 07:00:30 -0600 |
| commit | c40b15ae198452b47a09f9d1dec4d85ad2de75c8 (patch) | |
| tree | 218313f2983db5d4bbfe206f271c31cb103e3aef /phpBB | |
| parent | 4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f (diff) | |
| parent | 6251ca145978eddc017851c23b2558404692691b (diff) | |
| download | forums-c40b15ae198452b47a09f9d1dec4d85ad2de75c8.tar forums-c40b15ae198452b47a09f9d1dec4d85ad2de75c8.tar.gz forums-c40b15ae198452b47a09f9d1dec4d85ad2de75c8.tar.bz2 forums-c40b15ae198452b47a09f9d1dec4d85ad2de75c8.tar.xz forums-c40b15ae198452b47a09f9d1dec4d85ad2de75c8.zip | |
Merge pull request #2087 from marc1706/ticket/12239
[ticket/12239] Move deprecated passwords functions to compatibility file
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 35 | ||||
| -rw-r--r-- | phpBB/includes/functions_compatibility.php | 35 |
2 files changed, 35 insertions, 35 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 689a682de3..aca1443cce 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -368,41 +368,6 @@ function still_on_time($extra_time = 15) } /** -* Hash the password -* -* @deprecated 3.1.0-a2 (To be removed: 3.3.0) -* -* @param string $password Password to be hashed -* -* @return string|bool Password hash or false if something went wrong during hashing -*/ -function phpbb_hash($password) -{ - global $phpbb_container; - - $passwords_manager = $phpbb_container->get('passwords.manager'); - return $passwords_manager->hash($password); -} - -/** -* Check for correct password -* -* @deprecated 3.1.0-a2 (To be removed: 3.3.0) -* -* @param string $password The password in plain text -* @param string $hash The stored password hash -* -* @return bool Returns true if the password is correct, false if not. -*/ -function phpbb_check_hash($password, $hash) -{ - global $phpbb_container; - - $passwords_manager = $phpbb_container->get('passwords.manager'); - return $passwords_manager->check($password, $hash); -} - -/** * Hashes an email address to a big integer * * @param string $email Email address diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 2197815087..62c2ba6905 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -48,3 +48,38 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $ return phpbb_get_avatar($row, $alt, $ignore_config); } + +/** +* Hash the password +* +* @deprecated 3.1.0-a2 (To be removed: 3.3.0) +* +* @param string $password Password to be hashed +* +* @return string|bool Password hash or false if something went wrong during hashing +*/ +function phpbb_hash($password) +{ + global $phpbb_container; + + $passwords_manager = $phpbb_container->get('passwords.manager'); + return $passwords_manager->hash($password); +} + +/** +* Check for correct password +* +* @deprecated 3.1.0-a2 (To be removed: 3.3.0) +* +* @param string $password The password in plain text +* @param string $hash The stored password hash +* +* @return bool Returns true if the password is correct, false if not. +*/ +function phpbb_check_hash($password, $hash) +{ + global $phpbb_container; + + $passwords_manager = $phpbb_container->get('passwords.manager'); + return $passwords_manager->check($password, $hash); +} |