nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-02-21 04:43:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync ldap user - reactivate

Browse Source
This commit is contained in:
Jean-Baptiste Guerraz 2018-01-10 15:55:26 +01:00
parent bc9c39c455
commit 0fa38c8580
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/drivers_ldap.php
View File

@ -598,11 +598,11 @@ function sync_LDAP(){
$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");
$qry = new AwlQuery( "SELECT username, user_no, modified as updated , user_active FROM dav_principal where type_id=1");
$qry->Exec('sync_LDAP',__LINE__,__FILE__);
while($db_user = $qry->Fetch()) {
$db_users[] = $db_user->username;
$db_users_info[$db_user->username] = array('user_no' => $db_user->user_no, 'updated' => $db_user->updated);
$db_users_info[$db_user->username] = array('user_no' => $db_user->user_no, 'updated' => $db_user->updated, 'user_active' => $db_user->user_active);
}
// all users from ldap
@ -695,8 +695,9 @@ function sync_LDAP(){
$valid[$mapping['modified']] = "$Y-$m-$d $H:$M:$S";
$db_timestamp = substr(strtr($db_users_info[$username]['updated'], array(':' => '',' '=>'','-'=>'')),0,14);
if ( $ldap_timestamp > $db_timestamp ) {
sync_user_from_LDAP($principal, $mapping, $valid );
if ( $ldap_timestamp > $db_timestamp || !$db_users_info[$username]['user_active']) {
$principal->user_active = true;
sync_user_from_LDAP($principal, $mapping, $valid);
}
else {
unset($users_to_update[$key]);