[Pkg-owncloud-commits] [owncloud] 02/111: LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit fc040755c149e496bf1c748b7b93c8c9124dbc89
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Tue Nov 5 13:19:32 2013 +0100

    LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed
---
 apps/user_ldap/lib/wizard.php |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 9428a98..a2628ed 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -328,6 +328,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);
@@ -343,6 +350,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');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git