LDAP: better variable name

1 files changed, 9 insertions, 5 deletions

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index ecc13076179..7292ca15e78 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -65,7 +65,7 @@ class Connection {
 		'ldapAttributesForGroupSearch' => null,
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
-		'ldapExpertUidAttr' => null,
+		'ldapExpertUsernameAttr' => null,
 		'ldapExpertUUIDAttr' => null,
 	);
 
@@ -267,8 +267,8 @@ class Connection {
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_user_search'));
 			$this->config['ldapAttributesForGroupSearch']
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_group_search'));
-			$this->config['ldapExpertUidAttr']
-				= $this->$v('ldap_expert_uid_attr');
+			$this->config['ldapExpertUsernameAttr']
+				= $this->$v('ldap_expert_username_attr');
 			$this->config['ldapExpertUUIDAttr']
 				= $this->$v('ldap_expert_uuid_attr');
 
@@ -308,7 +308,7 @@ class Connection {
 			'ldap_configuration_active' => 'ldapConfigurationActive',
 			'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
 			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
-			'ldap_expert_uid_attr' => 'ldapExpertUidAttr',
+			'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
 			'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
 		);
 		return $array;
@@ -512,6 +512,10 @@ class Connection {
 			$configurationOK = false;
 		}
 
+		if(!empty($this->config['ldapExpertUUIDAttr'])) {
+			$this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+		}
+
 		return $configurationOK;
 	}
 
@@ -550,7 +554,7 @@ class Connection {
 			'ldap_configuration_active'			=> 1,
 			'ldap_attributes_for_user_search'	=> '',
 			'ldap_attributes_for_group_search'	=> '',
-			'ldap_expert_uid_attr'              => '',
+			'ldap_expert_username_attr'              => '',
 			'ldap_expert_uuid_attr'             => '',
 		);
 	}