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

Merge branch 'ldap-uid-vs-cn' into 'master'

Browse Source 
LDAP: any 'dn' compatibility

See merge request davical-project/davical!43
This commit is contained in:
Florian Schlichting 2018-01-10 21:39:21 +00:00
commit db709ddebd
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/drivers_ldap.php
View File

@ -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__);