diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-15 14:21:38 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-15 14:50:03 +0200 |
| commit | 2a03db606556f6536c04cf0f4d45d553a215041a (patch) | |
| tree | 8fd92e8ba3e068874753738957a5a879cabc97d4 | |
| parent | 8a6fa65ed6dcd7b81891e9a06b771c1c464ebcb9 (diff) | |
| download | nextcloud-server-2a03db606556f6536c04cf0f4d45d553a215041a.tar.gz nextcloud-server-2a03db606556f6536c04cf0f4d45d553a215041a.zip | |
don't forget changes in lib_ldap for last commit
| -rw-r--r-- | apps/user_ldap/lib_ldap.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php index afb442e05f3..4a4784eb159 100644 --- a/apps/user_ldap/lib_ldap.php +++ b/apps/user_ldap/lib_ldap.php @@ -35,6 +35,9 @@ class OC_LDAP { static protected $ldapAgentPassword; static protected $ldapTLS; static protected $ldapNoCase; + // user and group settings, that are needed in both backends + static protected $ldapUserDisplayName; + static public function init() { self::readConfiguration(); @@ -123,13 +126,14 @@ class OC_LDAP { */ static private function readConfiguration() { if(!self::$configured) { - self::$ldapHost = OC_Appconfig::getValue('user_ldap', 'ldap_host', ''); - self::$ldapPort = OC_Appconfig::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT); - self::$ldapAgentName = OC_Appconfig::getValue('user_ldap', 'ldap_dn',''); - self::$ldapAgentPassword = OC_Appconfig::getValue('user_ldap', 'ldap_password',''); - self::$ldapBase = OC_Appconfig::getValue('user_ldap', 'ldap_base',''); - self::$ldapTLS = OC_Appconfig::getValue('user_ldap', 'ldap_tls',0); - self::$ldapNoCase = OC_Appconfig::getValue('user_ldap', 'ldap_nocase', 0); + self::$ldapHost = OC_Appconfig::getValue('user_ldap', 'ldap_host', ''); + self::$ldapPort = OC_Appconfig::getValue('user_ldap', 'ldap_port', OC_USER_BACKEND_LDAP_DEFAULT_PORT); + self::$ldapAgentName = OC_Appconfig::getValue('user_ldap', 'ldap_dn',''); + self::$ldapAgentPassword = OC_Appconfig::getValue('user_ldap', 'ldap_password',''); + self::$ldapBase = OC_Appconfig::getValue('user_ldap', 'ldap_base',''); + self::$ldapTLS = OC_Appconfig::getValue('user_ldap', 'ldap_tls',0); + self::$ldapNoCase = OC_Appconfig::getValue('user_ldap', 'ldap_nocase', 0); + self::$ldapUserDisplayName = OC_Appconfig::getValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME); //TODO: sanity checking self::$configured = true; |