From 79acc80eb7b08425c489f816b9247c95292f0a07 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Guerraz Date: Wed, 10 Jan 2018 17:00:13 +0100 Subject: [PATCH] use php ldap explode in order to be compatible with any dn --- inc/drivers_ldap.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php index 24b371a1..b41a7d1f 100644 --- a/inc/drivers_ldap.php +++ b/inc/drivers_ldap.php @@ -430,9 +430,7 @@ function LDAP_check($username, $password ){ function fix_unique_member($list) { $fixed_list = array(); foreach ( $list as $member ){ - list( $mem, $rest ) = explode(",", $member ); - $member = str_replace( 'uid=', '', $mem ); - array_unshift( $fixed_list, $member ); + array_unshift( $fixed_list, ldap_explode_dn($member,1)[0]); } return $fixed_list; } @@ -529,8 +527,7 @@ function sync_LDAP_groups(){ $c->messages[] = sprintf(i18n('- adding users %s to group : %s'),join(',',$ldap_groups_info[$group][$mapping['members']]),$group); foreach ( $ldap_groups_info[$group][$mapping['members']] as $member ){ if ( $member_field == 'uniqueMember' || $dnfix ) { - list( $mem, $rest ) = explode(",", $member ); - $member = str_replace( 'uid=', '', $mem ); + $member = ldap_explode_dn($member,1)[0]; } $qry = new AwlQuery( "INSERT INTO group_member SELECT g.principal_id AS group_id,u.principal_id AS member_id FROM dav_principal g, dav_principal u WHERE g.username=:group AND u.username=:member;",array (':group'=>$group,':member'=>$member) ); $qry->Exec('sync_LDAP_groups',__LINE__,__FILE__);