diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-25 08:23:32 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-25 08:23:32 -0800 |
| commit | f50be257041b6569f2322a51c71e0728f828a1f0 (patch) | |
| tree | d6d9bf5a52972c88fbdbac2489c50a3931d2d8cc /apps/user_ldap/lib | |
| parent | ede0e7d6bc6f317c0e548f9e85dff33a6f3b6337 (diff) | |
| parent | e4e915fa3b461083f30afc4f17c627cccafcb0f8 (diff) | |
| download | nextcloud-server-f50be257041b6569f2322a51c71e0728f828a1f0.tar.gz nextcloud-server-f50be257041b6569f2322a51c71e0728f828a1f0.zip | |
Merge pull request #1864 from owncloud/fix_display_default
LDAP: simplify default for user home settings, fixes wrong display of de...
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index abbc133038c..6643428afe4 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -357,9 +357,6 @@ class Connection { case 'ldapAgentPassword': $value = base64_encode($value); break; - case 'homeFolderNamingRule': - $value = empty($value) ? 'opt:username' : $value; - break; case 'ldapBase': case 'ldapBaseUsers': case 'ldapBaseGroups': @@ -394,10 +391,10 @@ class Connection { $config = array(); foreach($trans as $dbKey => $classKey) { if($classKey == 'homeFolderNamingRule') { - if(strpos($this->config[$classKey], 'opt') === 0) { - $config[$dbKey] = ''; - } else { + if(strpos($this->config[$classKey], 'attr:') === 0) { $config[$dbKey] = substr($this->config[$classKey], 5); + } else { + $config[$dbKey] = ''; } continue; } else if((strpos($classKey, 'ldapBase') !== false) @@ -540,7 +537,7 @@ class Connection { 'ldap_cache_ttl' => 600, 'ldap_uuid_attribute' => 'auto', 'ldap_override_uuid_attribute' => 0, - 'home_folder_naming_rule' => 'opt:username', + 'home_folder_naming_rule' => '', 'ldap_turn_off_cert_check' => 0, 'ldap_configuration_active' => 1, 'ldap_attributes_for_user_search' => '', |