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

Fix computing delays

This commit is contained in:
Daniel Berteaud 2016-03-16 09:39:16 +01:00
parent 40cfe05301
commit 15fa733e73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
root/sbin/e-smith/expire-accounts
View File

@ -99,7 +99,7 @@ foreach my $user ($a->users){
push @lock, $user->key;
}
else{
my $remaining = ($exp - $now)->in_units('days');
my $remaining = $exp->delta_days($now)->in_units('days');
print $user->key . ": Account will expire on $lock_date ($remaining days)\n" if $debug;
$rem->{$user->key} = $remaining if $remaining < $warn_delay;
}
@ -156,7 +156,7 @@ foreach my $user (keys %$rem){
month => $2,
day => $3,
);
if ( ($last_notif - $now)->in_units('days') < $days_between_warn ){
if ( $last_notif->delta_days($now)->in_units('days') < $days_between_warn ){
next;
}
}

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

@ -103,7 +103,7 @@ sub print_user_table {
day => $3
);
};
$days_left = ($lock_on - $now)->in_units('days') if ($lock_on);
$days_left = $lock_on->delta_days($now)->in_units('days') if ($lock_on);
}
my $addr = ($delivery eq 'local') ? '' : $fwd;
print $q->Tr(
@ -146,7 +146,7 @@ sub print_user_table {
};
if ($locked_date){
my $delete_on = $locked_date->add(days => $delete_in);
$days_left = ($delete_on - $now)->in_units('days');
$days_left = $delete_on->delta_days($now)->in_units('days');
}
}
my $addr = ($delivery eq 'local') ? '' : $fwd;