diff options
| author | chang-zhao <chang-zhao@users.noreply.github.com> | 2015-03-21 15:43:06 +0300 |
|---|---|---|
| committer | chang-zhao <chang-zhao@users.noreply.github.com> | 2015-03-21 15:43:06 +0300 |
| commit | 04b2c4dcc9d6084cfaa455fb4db8e87ba70f4d15 (patch) | |
| tree | f2a0e5062f11e393a0621324e971626f1b5d8c7d /lib/plugins/authldap/auth.php | |
| parent | ba5dadc95a458f1ce06b6c61978acf9330c9f3d5 (diff) | |
| parent | 8a6a4be3f464afb3d69b51b74d95e8fbf21ea2df (diff) | |
| download | rpg-04b2c4dcc9d6084cfaa455fb4db8e87ba70f4d15.tar.gz rpg-04b2c4dcc9d6084cfaa455fb4db8e87ba70f4d15.tar.bz2 | |
Merge pull request #1 from splitbrain/master
Test
Diffstat (limited to 'lib/plugins/authldap/auth.php')
| -rw-r--r-- | lib/plugins/authldap/auth.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php index 50735882f..9d031c049 100644 --- a/lib/plugins/authldap/auth.php +++ b/lib/plugins/authldap/auth.php @@ -37,7 +37,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { } // Add the capabilities to change the password - $this->cando['modPass'] = true; + $this->cando['modPass'] = $this->getConf('modPass'); } /** @@ -360,8 +360,9 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { $sr = ldap_search($this->con, $this->getConf('usertree'), $all_filter); $entries = ldap_get_entries($this->con, $sr); $users_array = array(); + $userkey = $this->getConf('userkey'); for($i = 0; $i < $entries["count"]; $i++) { - array_push($users_array, $entries[$i]["uid"][0]); + array_push($users_array, $entries[$i][$userkey][0]); } asort($users_array); $result = $users_array; |