diff options
| author | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
| commit | 762b4c44c691f69d521413d7016314e7f547c102 (patch) | |
| tree | 95ab294b1df2f8c7a5efb56762a0f284bec3754e /inc/auth | |
| parent | eae17177de8f3f3580af5ea66d126aee0f23227f (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.gz rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.bz2 | |
Merge remote branch 'origin/master' into sitemap
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ad.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 9ae6dbbd1..90fe0266b 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -26,7 +26,7 @@ * $conf['auth']['ad']['use_ssl'] = 1; * $conf['auth']['ad']['debug'] = 1; * - * // get additional informations to the userinfo array + * // get additional information to the userinfo array * // add a list of comma separated ldap contact fields. * $conf['auth']['ad']['additional'] = 'field1,field2'; * @@ -155,7 +155,7 @@ class auth_ad extends auth_basic { $info['uid'] = $result[0]['samaccountname'][0]; $info['dn'] = $result[0]['dn']; - // additional informations + // additional information foreach ($this->cnf['additional'] as $field) { if (isset($result[0][strtolower($field)])) { $info[$field] = $result[0][strtolower($field)][0]; |