From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 17 May 2012 11:15:26 +0000 (+0200)
Subject: LDAP: Fix case sensitivity issues with display name attribute
X-Git-Tag: v4.0.0RC2~23
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38c56388c1f7469139114d2db254f693cacd800f;p=nextcloud-server.git

LDAP: Fix case sensitivity issues with display name attribute
---

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 614c6d916f4..4618921b4a6 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -484,8 +484,14 @@ class OC_LDAP {
 				$i = 0;
 			}
 			foreach($findings as $item) {
+				if(!is_array($item)) {
+					continue;
+				}
+				$item = array_change_key_case($item);
+
 				if($multiarray) {
 					foreach($attr as $key) {
+						$key = strtolower($key);
 						if(isset($item[$key])) {
 							if($key != 'dn'){
 								$selection[$i][$key] = $item[$key][0];
@@ -498,10 +504,6 @@ class OC_LDAP {
 					$i++;
 				} else {
 					//tribute to case insensitivity
-					if(!is_array($item)) {
-						continue;
-					}
-					$item = array_change_key_case($item);
 					$key = strtolower($attr[0]);
 
 					if(isset($item[$key])) {
@@ -599,10 +601,10 @@ class OC_LDAP {
 			self::$ldapBaseGroups       = OCP\Config::getAppValue('user_ldap', 'ldap_base_groups', self::$ldapBase);
 			self::$ldapTLS              = OCP\Config::getAppValue('user_ldap', 'ldap_tls',0);
 			self::$ldapNoCase           = OCP\Config::getAppValue('user_ldap', 'ldap_nocase', 0);
-			self::$ldapUserDisplayName  = OCP\Config::getAppValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME);
+			self::$ldapUserDisplayName  = strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME));
 			self::$ldapUserFilter       = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter','objectClass=person');
 			self::$ldapLoginFilter      = OCP\Config::getAppValue('user_ldap', 'ldap_login_filter', '(uid=%uid)');
-			self::$ldapGroupDisplayName = OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR);
+			self::$ldapGroupDisplayName = strtolower(OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR));
 
 			if(empty(self::$ldapBaseUsers)) {
 				OCP\Util::writeLog('ldap', 'Base for Users is empty, using Base DN', OCP\Util::INFO);