fix not working installation in Univention caused by new Univention auth plugin

This commit is contained in:
Ralf Becker 2018-08-16 19:08:14 +02:00
parent d7c462149a
commit 1ef14cc4c8

View File

@ -307,7 +307,7 @@ if (!isset($GLOBALS['egw_domain']) || $config['domain'] !== 'default' && !isset
$extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']); $extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']);
$extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type'])); $extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type']));
if (empty($rest)) unset($config['account-auth']); if (empty($rest)) unset($config['account-auth']);
if ($config['account_repository'] == 'ldap' || $config['auth_type'] == 'ldap') if (array_intersect(array($config['account_repository'], $config['auth_type']), array('ldap', 'univention')))
{ {
// set account_min_id to 1100 if not specified to NOT clash with system accounts // set account_min_id to 1100 if not specified to NOT clash with system accounts
$extra_config .= ' '.escapeshellarg('account_min_id='.(!empty($config['account_min_id']) ? $config['account_min_id'] : 1100)); $extra_config .= ' '.escapeshellarg('account_min_id='.(!empty($config['account_min_id']) ? $config['account_min_id'] : 1100));