diff options
| author | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
|---|---|---|
| committer | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
| commit | 195b52cb63eda3d8e3af6195058a0e1403e4dede (patch) | |
| tree | 4c79947d856f136051a84171eba913b1517a3bd1 /apps/user_ldap/lib/connection.php | |
| parent | c111a3aa248bee2bff22318c2a3d0da32ea0e451 (diff) | |
| parent | d713948d3f85a6e0a369bf1a9052ce563250e3da (diff) | |
| download | nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.tar.gz nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.zip | |
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
| -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' => '', |