Merge pull request #5700 from owncloud/ldapWizSetDisplayNames

LDAP Wizard: do not forget to set display name attributes for user and g...

1 files changed, 13 insertions, 0 deletions

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 0b2a6a540ff..fb6aca9e961 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -310,6 +310,13 @@ class Wizard extends LDAPUtility {
 										   ))) {
 			return false;
 		}
+		//make sure the use display name is set
+		$displayName = $this->configuration->ldapGroupDisplayName;
+		if(empty($displayName)) {
+			$d = $this->configuration->getDefaults();
+			$this->applyFind('ldap_group_display_name',
+							 $d['ldap_group_display_name']);
+		}
 		$filter = $this->composeLdapFilter(self::LFILTER_GROUP_LIST);
 
 		$this->applyFind('ldap_group_filter', $filter);
@@ -323,6 +330,12 @@ class Wizard extends LDAPUtility {
 										   ))) {
 			return false;
 		}
+		//make sure the use display name is set
+		$displayName = $this->configuration->ldapUserDisplayName;
+		if(empty($displayName)) {
+			$d = $this->configuration->getDefaults();
+			$this->applyFind('ldap_display_name', $d['ldap_display_name']);
+		}
 		$filter = $this->composeLdapFilter(self::LFILTER_USER_LIST);
 		if(!$filter) {
 			throw new \Exception('Cannot create filter');