diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm index 6e0f306..8af0f1c 100644 --- a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm +++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm @@ -135,6 +135,8 @@ sub print_user_table { my $fwd = $u->prop('ForwardAddress') || ''; my $action = "" . $self->localise('MODIFY') . ""; + # 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; }