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

More consistently do the ldap timestamp munding. Probably this

Browse Source 
should really be done in a separate 'munge_ldap_timestamp()' function.
This commit is contained in:
Andrew McMillan 2007-11-01 14:48:50 +13:00
parent 13f915ee1b
commit e34807cc17
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
inc/drivers_ldap.php
View File

@ -162,8 +162,6 @@ function sync_user_from_LDAP( &$usr, $mapping, $ldap_values );
if ( in_array($field, $validUserFields) ) $usr->{$field} = $ldap_values[$value]; if ( in_array($field, $validUserFields) ) $usr->{$field} = $ldap_values[$value];
} }
$user->updated = "$Y-$m-$d $H:$M:$S";
UpdateUserFromExternal( $usr ); UpdateUserFromExternal( $usr );
} }
@ -210,8 +208,9 @@ function LDAP_check($username, $password ){
foreach($c->authenticate_hook['config']['format_updated'] as $k => $v) foreach($c->authenticate_hook['config']['format_updated'] as $k => $v)
$$k = substr($ldap_timestamp,$v[0],$v[1]); $$k = substr($ldap_timestamp,$v[0],$v[1]);
// ok it is valid is already exist in db ?
$ldap_timestamp = "$Y"."$m"."$d"."$H"."$M"."$S"; $ldap_timestamp = "$Y"."$m"."$d"."$H"."$M"."$S";
$valid[$mapping["updated"]] = "$Y-$m-$d $H:$M:$S";
if ( $usr = getUserByName($username) ) { if ( $usr = getUserByName($username) ) {
// should we update it ? // should we update it ?
$db_timestamp = $usr->updated; $db_timestamp = $usr->updated;
@ -269,7 +268,18 @@ function sync_LDAP(){
foreach( $users_to_create as $username ) { foreach( $users_to_create as $username ) {
$user = (object) array( 'user_no' => 0, 'username' => $username ); $user = (object) array( 'user_no' => 0, 'username' => $username );
sync_user_from_LDAP( $user, $mapping, $ldap_users_info[$username] ); $valid = $ldap_users_info[$username];
$ldap_timestamp = $valid[$mapping["updated"]];
/**
* This splits the LDAP timestamp apart and assigns values to $Y $m $d $H $M and $S
*/
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";
sync_user_from_LDAP( $user, $mapping, $valid );
} }
} }
@ -296,6 +306,7 @@ function sync_LDAP(){
foreach($c->authenticate_hook['config']['format_updated'] as $k => $v) foreach($c->authenticate_hook['config']['format_updated'] as $k => $v)
$$k = substr($ldap_timestamp,$v[0],$v[1]); $$k = substr($ldap_timestamp,$v[0],$v[1]);
$ldap_timestamp = "$Y"."$m"."$d"."$H"."$M"."$S"; $ldap_timestamp = "$Y"."$m"."$d"."$H"."$M"."$S";
$valid[$mapping["updated"]] = "$Y-$m-$d $H:$M:$S";
$db_timestamp = substr(strtr($db_users_info[$username]['updated'], array(':' => '',' '=>'','-'=>'')),0,14); $db_timestamp = substr(strtr($db_users_info[$username]['updated'], array(':' => '',' '=>'','-'=>'')),0,14);
if ( $ldap_timestamp > $db_timestamp ) { if ( $ldap_timestamp > $db_timestamp ) {