nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-29 18:26:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Catch more instances of deprecated mapping names.

Browse Source
This commit is contained in:
Andrew McMillan 2011-10-28 14:25:32 +13:00
parent 062e01aede
commit 1148f0cbc8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/drivers_ldap.php
View File

@ -323,7 +323,7 @@ function LDAP_check($username, $password ){
$filter_munge = "($ldapDriver->filterUsers)";
}
$filter = "(&$filter_munge(".$mapping["username"]."=$username))";
$filter = "(&$filter_munge(".$mapping['username']."=$username))";
$valid = $ldapDriver->requestUser( $filter, $attributes, $username, $password );
// is a valid user or not
@ -332,7 +332,7 @@ function LDAP_check($username, $password ){
return false;
}
$ldap_timestamp = $valid[$mapping["updated"]];
$ldap_timestamp = $valid[$mapping['modified']];
/**
* This splits the LDAP timestamp apart and assigns values to $Y $m $d $H $M and $S
@ -341,7 +341,7 @@ function LDAP_check($username, $password ){
$$k = substr($ldap_timestamp,$v[0],$v[1]);
$ldap_timestamp = "$Y"."$m"."$d"."$H"."$M"."$S";
$valid[$mapping["updated"]] = "$Y-$m-$d $H:$M:$S";
$valid[$mapping['modified']] = "$Y-$m-$d $H:$M:$S";
$principal = new Principal('username',$username);
if ( $principal->Exists() ) {
@ -514,7 +514,7 @@ function sync_LDAP(){
if ( sizeof($ldap_users_tmp) == 0 ) return;
foreach($ldap_users_tmp as $key => $ldap_user){
$ldap_users_info[$ldap_user[$mapping["username"]]] = $ldap_user;
$ldap_users_info[$ldap_user[$mapping['username']]] = $ldap_user;
unset($ldap_users_tmp[$key]);
}
$qry = new AwlQuery( "SELECT username, user_no, modified as updated FROM dav_principal where type_id=1");
@ -548,7 +548,7 @@ function sync_LDAP(){
foreach($c->authenticate_hook['config']['format_updated'] as $k => $v)
$$k = substr($ldap_timestamp,$v[0],$v[1]);
$ldap_timestamp = $Y.$m.$d.$H.$M.$S;
$valid[$mapping["updated"]] = "$Y-$m-$d $H:$M:$S";
$valid[$mapping['modified']] = "$Y-$m-$d $H:$M:$S";
sync_user_from_LDAP( $principal, $mapping, $valid );
}