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

honour do_not_sync_from_ldap when creating users, correctly display all results

Browse Source 
despite its name, $c->do_not_sync_from_ldap did not stop accounts in
LDAP from being created in Davical, it only stopped accounts not in LDAP
from being deactived in Davical (like a local admin account)
This commit is contained in:
Florian Schlichting 2019-01-30 21:57:24 +01:00
parent afcaacaf2a
commit eb0e9a8aec
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/drivers_ldap.php
View File

@ -621,9 +621,12 @@ function sync_LDAP(){
// creation of all users;
if ( sizeof($users_to_create) ) {
$c->messages[] = sprintf(i18n('- creating record for users : %s'),join(', ',$users_to_create));
foreach( $users_to_create as $username ) {
foreach( $users_to_create as $k => $username ) {
if ( isset($c->do_not_sync_from_ldap) && isset($c->do_not_sync_from_ldap[$username]) ) {
unset( $users_to_create[$k] );
$users_nothing_done[] = $username;
continue;
}
$principal = new Principal( 'username', $username );
$valid = $ldap_users_info[$username];
if ( $mapping['modified'] != "" && array_key_exists($mapping['modified'], $valid)) {
@ -652,6 +655,7 @@ function sync_LDAP(){
sync_user_from_LDAP( $principal, $mapping, $valid );
}
$c->messages[] = sprintf( i18n('- creating record for users : %s'), join(', ',$users_to_create) );
}
// deactivating all users
@ -711,10 +715,11 @@ function sync_LDAP(){
}
if ( sizeof($users_to_update) )
$c->messages[] = sprintf(i18n('- updating user records : %s'),join(', ',$users_to_update));
if ( sizeof($users_nothing_done) )
$c->messages[] = sprintf(i18n('- nothing done on : %s'),join(', ', $users_nothing_done));
}
if ( sizeof($users_nothing_done) )
$c->messages[] = sprintf( i18n('- nothing done on : %s'), join(', ',$users_nothing_done) );
// check for remaining admins
$admins = 0;
$qry = new AwlQuery( "SELECT count(*) AS admins FROM usr JOIN role_member USING ( user_no ) JOIN roles USING (role_no) WHERE usr.active=TRUE AND role_name='Admin'");
$qry->Exec('sync_LDAP',__LINE__,__FILE__);