diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-05-08 14:05:08 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-05-08 14:05:08 +0200 |
| commit | bc23010670ecab5c5a0938e9e1a7a1f486f51827 (patch) | |
| tree | 2624e514b7d18e6d11059cf19c3f28f92c58b3eb | |
| parent | c18158906cb39b0b7c2dafe429e8371f20f044e9 (diff) | |
| download | nextcloud-server-bc23010670ecab5c5a0938e9e1a7a1f486f51827.tar.gz nextcloud-server-bc23010670ecab5c5a0938e9e1a7a1f486f51827.zip | |
LDAP: implement r+w for new settings
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index ef7cc5295b3..ecc13076179 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -65,6 +65,8 @@ class Connection { 'ldapAttributesForGroupSearch' => null, 'homeFolderNamingRule' => null, 'hasPagedResultSupport' => false, + 'ldapExpertUidAttr' => null, + 'ldapExpertUUIDAttr' => null, ); /** @@ -265,6 +267,10 @@ 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['ldapExpertUUIDAttr'] + = $this->$v('ldap_expert_uuid_attr'); $this->configured = $this->validateConfiguration(); } @@ -290,7 +296,6 @@ class Connection { 'ldap_group_filter'=>'ldapGroupFilter', 'ldap_display_name'=>'ldapUserDisplayName', 'ldap_group_display_name'=>'ldapGroupDisplayName', - 'ldap_tls'=>'ldapTLS', 'ldap_nocase'=>'ldapNoCase', 'ldap_quota_def'=>'ldapQuotaDefault', @@ -302,7 +307,9 @@ class Connection { 'ldap_turn_off_cert_check' => 'turnOffCertCheck', 'ldap_configuration_active' => 'ldapConfigurationActive', 'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch', - 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch' + 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch', + 'ldap_expert_uid_attr' => 'ldapExpertUidAttr', + 'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr', ); return $array; } @@ -543,6 +550,8 @@ class Connection { 'ldap_configuration_active' => 1, 'ldap_attributes_for_user_search' => '', 'ldap_attributes_for_group_search' => '', + 'ldap_expert_uid_attr' => '', + 'ldap_expert_uuid_attr' => '', ); } |