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

Accept today as a future date 

As expiration occures on next day
This commit is contained in:
Daniel Berteaud 2016-04-12 14:50:12 +02:00
parent 175aed3556
commit b164167729
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,7 @@ sub is_positive_int{
return 'OK';
}
# Take a string representing a date, must be YYY-MM-DD format, and in the future, or an empty string
# Take a string representing a date, must be YYY-MM-DD format, and in the future (including today), or an empty string
sub is_future_date_or_empty {
my ($self, $date_string) = @_;
return 'OK' if ($date_string eq '');
@ -330,7 +330,7 @@ sub is_future_date_or_empty {
};
return $self->localise('DATE_FORMAT_INVALID') unless ($date);
my $now = DateTime->now;
return $self->localise('DATE_IS_PASSED') unless ($date > $now);
return $self->localise('DATE_IS_PASSED') unless ($date >= $now);
return 'OK';
}