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

Allow multiple LDAP fields to map to DAViCal fields.

Browse Source
This commit is contained in:
Andrew McMillan 2012-07-08 22:53:43 +12:00
parent 2e19bbb535
commit dbfd835488
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
inc/drivers_ldap.php
View File

@ -264,9 +264,19 @@ function sync_user_from_LDAP( Principal &$principal, $mapping, $ldap_values ) {
$fields_to_set = array(); $fields_to_set = array();
$updateable_fields = Principal::updateableFields(); $updateable_fields = Principal::updateableFields();
foreach( $updateable_fields AS $field ) { foreach( $updateable_fields AS $field ) {
if ( isset($mapping[$field]) && isset($ldap_values[$mapping[$field]]) ) { if ( isset($mapping[$field]) ) {
$fields_to_set[$field] = $ldap_values[$mapping[$field]]; $tab_part_fields = explode(',',$mapping[$field]);
dbg_error_log( "LDAP", "Setting usr->%s to %s from LDAP field %s", $field, $ldap_values[$mapping[$field]], $mapping[$field] ); foreach( $tab_part_fields as $part_field ) {
if ( isset($ldap_values[$part_field]) ) {
if (isset($fields_to_set[$field]) ) {
$fields_to_set[$field] .= ' '.$ldap_values[$part_field];
}
else {
$fields_to_set[$field] = $ldap_values[$part_field];
}
}
}
dbg_error_log( "LDAP", "Setting usr->%s to %s from LDAP field %s", $field, $fields_to_set[$field], $mapping[$field] );
} }
else if ( isset($c->authenticate_hook['config']['default_value']) && is_array($c->authenticate_hook['config']['default_value']) else if ( isset($c->authenticate_hook['config']['default_value']) && is_array($c->authenticate_hook['config']['default_value'])
&& isset($c->authenticate_hook['config']['default_value'][$field] ) ) { && isset($c->authenticate_hook['config']['default_value'][$field] ) ) {
@ -285,6 +295,19 @@ function sync_user_from_LDAP( Principal &$principal, $mapping, $ldap_values ) {
} }
} }
/*
* explode the multipart mapping
*/
function array_values_mapping($mapping){
$attributes=array();
foreach ( $mapping as $field ) {
$tab_part_field = explode(",",$field);
foreach( $tab_part_field as $part_field ) {
$attributes[] = $part_field;
}
}
return $attributes;
}
/** /**
* Check the username / password against the LDAP server * Check the username / password against the LDAP server
@ -314,7 +337,7 @@ function LDAP_check($username, $password ){
$mapping['modified'] = $mapping['updated']; $mapping['modified'] = $mapping['updated'];
unset($mapping['updated']); unset($mapping['updated']);
} }
$attributes = array_values($mapping); $attributes = array_values_mapping($mapping);
/** /**
* If the config contains a filter that starts with a ( then believe * If the config contains a filter that starts with a ( then believe
@ -380,7 +403,7 @@ function sync_LDAP_groups(){
$mapping = $c->authenticate_hook['config']['group_mapping_field']; $mapping = $c->authenticate_hook['config']['group_mapping_field'];
//$attributes = array('cn','modifyTimestamp','memberUid'); //$attributes = array('cn','modifyTimestamp','memberUid');
$attributes = array_values($mapping); $attributes = array_values_mapping($mapping);
$ldap_groups_tmp = $ldapDriver->getAllGroups($attributes); $ldap_groups_tmp = $ldapDriver->getAllGroups($attributes);
if ( sizeof($ldap_groups_tmp) == 0 ) return; if ( sizeof($ldap_groups_tmp) == 0 ) return;
@ -513,7 +536,7 @@ function sync_LDAP(){
if ( ! $ldapDriver->valid ) return; if ( ! $ldapDriver->valid ) return;
$mapping = $c->authenticate_hook['config']['mapping_field']; $mapping = $c->authenticate_hook['config']['mapping_field'];
$attributes = array_values($mapping); $attributes = array_values_mapping($mapping);
$ldap_users_tmp = $ldapDriver->getAllUsers($attributes); $ldap_users_tmp = $ldapDriver->getAllUsers($attributes);
if ( sizeof($ldap_users_tmp) == 0 ) return; if ( sizeof($ldap_users_tmp) == 0 ) return;