diff options
| -rw-r--r-- | apps/user_ldap/templates/settings.php | 7 | ||||
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 8a879fa2466..5f25570e229 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -5,10 +5,11 @@ <label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p> <p><label for="ldap_dn"><?php echo $l->t('Name');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" /> <label for="ldap_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_password" name="ldap_password" value="<?php echo $_['ldap_password']; ?>" /> - <?php echo $l->t('Leave both empty for anonymous bind for search, then bind with users credentials.');?></p> + <small><?php echo $l->t('Leave both empty for anonymous bind for search, then bind with users credentials.');?></small></p> <p><label for="ldap_base"><?php echo $l->t('Base');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" /> - <label for="ldap_filter"><?php echo $l->t('Filter (use %uid placeholder)');?></label><input type="text" id="ldap_filter" name="ldap_filter" value="<?php echo $_['ldap_filter']; ?>" /></p> - <p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" /></p> + <label for="ldap_filter"><?php echo $l->t('Filter (use %%uid placeholder)');?></label><input type="text" id="ldap_filter" name="ldap_filter" value="<?php echo $_['ldap_filter']; ?>" /></p> + <p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" /> + <small><?php echo $l->t('Currently the display name field needs to be the same you matched %%uid against in the filter above, because ownCloud doesn\'t distinguish between user id and user name.');?></small></p> <p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p> <input type="submit" value="Save" /> </fieldset> diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 8557a7fde50..249def7a1c8 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -143,8 +143,10 @@ class OC_USER_LDAP extends OC_User_Backend { else { $users = array(); foreach($entries as $row) { - if(isset($row[$this->ldap_display_name])) { - $users[] = $row[$this->ldap_display_name][0]; + // TODO ldap_get_entries() seems to lower all keys => needs review + $ldap_display_name = strtolower($this->ldap_display_name); + if(isset($row[$ldap_display_name])) { + $users[] = $row[$ldap_display_name][0]; } } // TODO language specific sorting of user names |