diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-02 13:28:38 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-02 13:28:38 +0200 |
| commit | 356f3eef0760f85b947cbffbf87918544e0f6c9d (patch) | |
| tree | 4c6727bcf42d8cc036b362ba1c03d9511e093943 /phpBB/phpbb/auth/provider/ldap.php | |
| parent | 61e4c0f25172231d203799e4c3c5920e665ab4fa (diff) | |
| download | forums-356f3eef0760f85b947cbffbf87918544e0f6c9d.tar forums-356f3eef0760f85b947cbffbf87918544e0f6c9d.tar.gz forums-356f3eef0760f85b947cbffbf87918544e0f6c9d.tar.bz2 forums-356f3eef0760f85b947cbffbf87918544e0f6c9d.tar.xz forums-356f3eef0760f85b947cbffbf87918544e0f6c9d.zip | |
[feature/passwords] Inject passwords manager into auth providers
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/auth/provider/ldap.php')
| -rw-r--r-- | phpBB/phpbb/auth/provider/ldap.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index 9d29789567..1e4dffde5b 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -27,16 +27,25 @@ if (!defined('IN_PHPBB')) class ldap extends \phpbb\auth\provider\base { /** + * phpBB passwords manager + * + * @var \phpbb\passwords\manager + */ + protected $passwords_manager; + + /** * LDAP Authentication Constructor * - * @param \phpbb\db\driver\driver $db - * @param \phpbb\config\config $config - * @param \phpbb\user $user + * @param \phpbb\db\driver\driver $db + * @param \phpbb\config\config $config + * @param \phpbb\passwords\manager $passwords_manager + * @param \phpbb\user $user */ - public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\user $user) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\user $user) { $this->db = $db; $this->config = $config; + $this->passwords_manager = $passwords_manager; $this->user = $user; } @@ -244,7 +253,7 @@ class ldap extends \phpbb\auth\provider\base // generate user account data $ldap_user_row = array( 'username' => $username, - 'user_password' => phpbb_hash($password), + 'user_password' => $this->passwords_manager->hash($password), 'user_email' => (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '', 'group_id' => (int) $row['group_id'], 'user_type' => USER_NORMAL, |