Commit e6324f48 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Tried an other way of fixing plist&config loop dependency

parent 1476aeb9
......@@ -321,13 +321,13 @@ class Index {
/* User might have its own language, re-run initLanguage */
initLanguage();
/* Check that newly installed plugins have their configuration in the LDAP (needed before load_plist to avoid PHP errors of missing RDNs in config) */
$config->checkLdapConfig();
/* We need a fully loaded plist and config to test account expiration */
session::global_un_set('plist');
$plist = load_plist();
/* Check that newly installed plugins have their configuration in the LDAP (will reload plist if needed) */
$config->checkLdapConfig();
/* Check account expiration */
if ($config->get_cfg_value('handleExpiredAccounts') == 'TRUE') {
$expired = $ui->expired_status();
......
......@@ -1081,8 +1081,7 @@ function get_ou($name)
$ou = $map[$name];
return $ou;
} else {
trigger_error('No department mapping found for type '.$name);
return '';
return NULL;
}
if ($ou != '') {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment