extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-09 23:11:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

* LDAP/AD: if only users get imported, set their primary group and memberships as configured for auto-created accounts (Default group by default)

Browse Source
This commit is contained in:
ralf 2023-04-05 16:57:33 +02:00
parent ccd6acd606
commit a0b81c3cc3
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/src/Accounts/Import.php
View File

@ -214,6 +214,7 @@ class Import
} }
$created = $updated = $uptodate = $errors = $deleted = 0; $created = $updated = $uptodate = $errors = $deleted = 0;
$default_memberships = $default_group_id = null;
if (in_array('groups', explode('+', $type))) if (in_array('groups', explode('+', $type)))
{ {
foreach($this->groups($initial_import ? null : $GLOBALS['egw_info']['server']['account_import_lastrun'], foreach($this->groups($initial_import ? null : $GLOBALS['egw_info']['server']['account_import_lastrun'],
@ -223,6 +224,23 @@ class Import
$$name += $val; $$name += $val;
} }
} }
// if only users get imported, set their primary group and memberships as configured for auto-created accounts
else
{
// check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships
foreach(preg_split('/[,;] */', $GLOBALS['egw_info']['server']['default_group_lid'] ?? 'Default') as $group_lid)
{
if (($group_id = $this->accounts_sql->name2id(trim($group_lid), 'account_lid', 'g')))
{
if (!$default_group_id) $default_group_id = $group_id;
$default_memberships[] = $group_id;
}
}
if (!$default_group_id && ($default_group_id = $this->accounts_sql->name2id('Default', 'account_lid', 'g')))
{
$default_memberships[] = $default_group_id;
}
}
// query all groups in SQL // query all groups in SQL
$sql_users = []; $sql_users = [];
@ -266,6 +284,8 @@ class Import
if (!($account_id = $this->accounts_sql->name2id($account['account_lid']))) if (!($account_id = $this->accounts_sql->name2id($account['account_lid'])))
{ {
$sql_account = $account; $sql_account = $account;
// if only users are imported set primary group as configured
if (isset($default_group_id)) $sql_account['account_primary_group'] = $default_group_id;
// check if account_id is not yet taken by another user or group --> add offset or unset it to let DB assign a new one // check if account_id is not yet taken by another user or group --> add offset or unset it to let DB assign a new one
while ($this->accounts_sql->read($sql_account['account_id'])) while ($this->accounts_sql->read($sql_account['account_id']))
{ {
@ -482,6 +502,12 @@ class Import
return array_search($account_lid, $groups); return array_search($account_lid, $groups);
}, $account['memberships'])), $local_memberships), $account_id); }, $account['memberships'])), $local_memberships), $account_id);
} }
// if only users are synced add new users to default group(s) as configured for auto-created accounts
elseif ($new && $default_memberships)
{
$this->accounts_sql->set_memberships($default_memberships, $account_id);
}
if ($new) if ($new)
{ {
++$created; ++$created;