fix unable to (re-)activate account

This commit is contained in:
Ralf Becker 2019-03-14 15:14:25 +01:00
parent 9e3fdf52cf
commit 6ba3dbbd33

View File

@ -174,7 +174,7 @@ class admin_account
'changepassword', 'anonymous', 'mustchangepassword', 'changepassword', 'anonymous', 'mustchangepassword',
'account_passwd', 'account_passwd_2', 'account_passwd', 'account_passwd_2',
'account_primary_group', 'account_primary_group',
'account_expires', 'account_expires', 'account_status',
'homedirectory', 'loginshell', 'homedirectory', 'loginshell',
'requested', 'requested_email', 'comment', // admin_cmd documentation (EPL) 'requested', 'requested_email', 'comment', // admin_cmd documentation (EPL)
) as $c_name => $a_name) ) as $c_name => $a_name)
@ -194,7 +194,8 @@ class admin_account
switch($a_name) switch($a_name)
{ {
case 'account_expires': case 'account_expires':
$account[$a_name] = $content[$c_name] ? $content[$c_name] : case 'account_status':
$account['account_expires'] = $content['account_expires'] ? $content['account_expires'] :
($content['account_status'] ? 'never' : 'already'); ($content['account_status'] ? 'never' : 'already');
break; break;