Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression where user canonification didn't work (Bifrost#251480)

Browse source 
Which led to not working some functionality e.g. user-specific LDAP addressbook
This commit is contained in:
Aleksander Machniak 2019-10-15 09:25:06 +02:00
parent 7491bf813c
commit 843fb0d69d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/libkolab/lib/kolab_storage.php
View file

@ -150,10 +150,16 @@ class kolab_storage
self::$config->set('kolab_auth_filter', $filter);
}
$user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
$user_field = $user_attrib = self::$config->get('kolab_users_id_attrib');
//$ldap->set_filter($this->ldap_filter);
$ldap->extend_fieldmap(array($user_attrib => $user_attrib));
// Fallback to kolab_auth_login, which is not attribute, but field name
if (!$user_field && ($user_field = self::$config->get('kolab_auth_login', 'email'))) {
$user_attrib = $config['fieldmap'][$user_field];
}
if ($user_field && $user_attrib) {
$ldap->extend_fieldmap(array($user_field => $user_attrib));
}
self::$ldap[$name] = $ldap;