koozali
/
smeserver-expire-accounts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only list inactive users which have been locked by expiration

This commit is contained in:
Daniel Berteaud 2016-04-11 12:03:54 +02:00
parent 47ae43fa7c
commit 9a20728e63
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
View File

@ -135,6 +135,8 @@ sub print_user_table {
my $fwd = $u->prop('ForwardAddress') || '';
my $action = "<a href=\"$scriptname?page=0&page_stack=&acctName=$username&wherenext=ModifyLocked\">" .
$self->localise('MODIFY') . "</a>";
# Skip if not locked by this contrib
next unless ($locked_on =~ m/^\d{4}\-\d{1,2}\-\d{1,2}$/);
my $days_left = '';
if ($delete_in =~ m/^\d+$/ && $locked_on =~ m/^(\d{4})\-(\d{1,2})\-(\d{1,2})$/){
my $locked_date = eval {
@ -297,7 +299,10 @@ sub _count_active_users{
sub _count_inactive_users{
my $users = 0;
foreach my $user ($a->users){
$users++ unless ($user->prop('PasswordSet') || 'no') eq 'yes';
if (($user->prop('PasswordSet') || 'no') eq 'no' &&
($user->prop('ExpireLockedOn') || '') =~ m/^\d{4}\-\d{1,2}\-\d{1,2}$/){
$users++;
}
}
return $users;
}