WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shadow account expiration date

This commit is contained in:
Roland Gruber 2019-03-03 10:28:43 +01:00
parent dd2fb80375
commit 12d5ac115a
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lam/HISTORY
View File

@ -6,6 +6,7 @@ March 2019
-> New self service fields: Mail routing (Local address) and Windows (Proxy-Addresses) -> New self service fields: Mail routing (Local address) and Windows (Proxy-Addresses)
-> Bind DLZ: support DNAME+XFR records and descriptions in records (requires latest LDAP schema) -> Bind DLZ: support DNAME+XFR records and descriptions in records (requires latest LDAP schema)
-> Cron jobs: added Shadow account expiration notification jobs -> Cron jobs: added Shadow account expiration notification jobs
-> New self service fields: Shadow account expiration date
- Fixed bugs: - Fixed bugs:
-> Allow tree-only configurations without any other tab -> Allow tree-only configurations without any other tab

28
lam/lib/modules/shadowAccount.inc
View File

@ -97,9 +97,15 @@ class shadowAccount extends baseModule implements passwordService {
'shadowInactive', 'shadowExpire', 'shadowFlag'); 'shadowInactive', 'shadowExpire', 'shadowFlag');
// lists for expiration date // lists for expiration date
$day = array('-'); $mon = array('-'); $year = array('-'); $day = array('-'); $mon = array('-'); $year = array('-');
for ( $i=1; $i<=31; $i++ ) $day[] = $i; for ( $i=1; $i<=31; $i++ ) {
for ( $i=1; $i<=12; $i++ ) $mon[] = $i; $day[] = $i;
for ( $i=2003; $i<=2030; $i++ ) $year[] = $i; }
for ( $i=1; $i<=12; $i++ ) {
$mon[] = $i;
}
for ( $i=2003; $i<=2030; $i++ ) {
$year[] = $i;
}
$profileOptionsTable = new htmlResponsiveRow(); $profileOptionsTable = new htmlResponsiveRow();
// auto add extension // auto add extension
$profileOptionsTable->add(new htmlResponsiveInputCheckbox('shadowAccount_addExt', false, _('Automatically add this extension'), 'autoAdd'), 12); $profileOptionsTable->add(new htmlResponsiveInputCheckbox('shadowAccount_addExt', false, _('Automatically add this extension'), 'autoAdd'), 12);
@ -231,7 +237,10 @@ class shadowAccount extends baseModule implements passwordService {
) )
); );
// self service fields // self service fields
$return['selfServiceFieldSettings'] = array('shadowLastChange' => _('Last password change (read-only)')); $return['selfServiceFieldSettings'] = array(
'shadowLastChange' => _('Last password change (read-only)'),
'shadowExpire' => _('Account expiration date (read-only)')
);
return $return; return $return;
} }
@ -750,6 +759,17 @@ class shadowAccount extends baseModule implements passwordService {
$row->addField(new htmlOutputText($shadowLastChange)); $row->addField(new htmlOutputText($shadowLastChange));
$return['shadowLastChange'] = $row; $return['shadowLastChange'] = $row;
} }
if (in_array('shadowExpire', $fields)) {
$shadowExpire = '';
if (isset($attributes['shadowExpire'][0])) {
$date = new DateTime('@' . $attributes['shadowExpire'][0] * 3600 * 24, new DateTimeZone('UTC'));
$shadowExpire = $date->format('d.m.Y');
}
$row = new htmlResponsiveRow();
$row->addLabel(new htmlOutputText($this->getSelfServiceLabel('shadowExpire', _('Account expiration date'))));
$row->addField(new htmlOutputText($shadowExpire));
$return['shadowExpire'] = $row;
}
return $return; return $return;
} }