nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-06-20 06:50:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always update groups from LDAP

Browse Source 
The logic actually handled updated group details, but only new groups were
being passed in. This will cause changes to what is being used for the
fullname to flow through.
This commit is contained in:
Andrew Ruthven 2024-02-03 23:34:34 +13:00
parent b77b2640f8
commit 98d9925241
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
inc/drivers_ldap.php
View File

@ -558,16 +558,15 @@ function sync_LDAP_groups(){
$ldap_groups = array_keys($ldap_groups_info);
// groups only in ldap
$groups_to_create = array_diff($ldap_groups, $db_groups);
// Groups only in LDAP or in both LDAP and DB. To be created or updated.
$groups_to_create = array_merge(
array_diff($ldap_groups, $db_groups),
array_intersect($db_groups, $ldap_groups));
// groups only in db
// Groups only in DB. To be disabled..
$groups_to_deactivate = array_diff($db_groups, $ldap_groups);
// groups present in ldap and in the db
$groups_to_update = array_intersect($db_groups, $ldap_groups);
// groups where nothing was done
// Groups where nothing was done
$groups_nothing_done[] = null;
if ( sizeof ( $groups_to_create ) ){
@ -633,15 +632,15 @@ function sync_LDAP_groups(){
Principal::cacheDelete('username', $group);
// mark group for updating, so users get synced
$groups_to_update[] = $group;
// mark group for sync'ing the members
$groups_to_sync_members[] = $group;
}
$c->messages[] = sprintf( i18n('- creating groups : %s'), join(', ',$groups_to_create) );
}
if ( sizeof ( $groups_to_update ) ){
$c->messages[] = sprintf(i18n('- updating groups : %s'),join(', ',$groups_to_update));
if ( sizeof ( $groups_to_sync_members ) ){
$c->messages[] = sprintf(i18n('- updating groups : %s'),join(', ',$groups_to_sync_members));
// Support the old name of user_mapping_field..
$user_mapping = NULL;
@ -651,7 +650,7 @@ function sync_LDAP_groups(){
$user_mapping = $c->authenticate_hook['config']['mapping_field'];
}
foreach ( $groups_to_update as $group ){
foreach ( $groups_to_sync_members as $group ) {
$db_members = is_array( $db_group_members[$group] )
? array_values( $db_group_members[$group] )
: array();