X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Futil%2FNotary.java;h=c349a0f92ad61f5fa8049f9c71e0643c28325b13;hb=efa3fa46bca73b26c5ef7142cf6d436fb2e5468b;hp=36f1fa48c3c603c3c1dd5ed7ab3a30437bf5d2a1;hpb=0d5ae34e23b50f59e759702b1ebf6f5a3a7137f4;p=gigi.git diff --git a/src/club/wpia/gigi/util/Notary.java b/src/club/wpia/gigi/util/Notary.java index 36f1fa48..c349a0f9 100644 --- a/src/club/wpia/gigi/util/Notary.java +++ b/src/club/wpia/gigi/util/Notary.java @@ -3,7 +3,6 @@ package club.wpia.gigi.util; import java.io.IOException; import java.text.ParseException; import java.util.Calendar; -import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Map; @@ -93,13 +92,11 @@ public class Notary { gae.mergeInto(new GigiApiException("You must enter the date when you met the applicant.")); } else { try { - Date d = DateSelector.getDateFormat().parse(date); - Calendar gc = GregorianCalendar.getInstance(); - gc.setTimeInMillis(System.currentTimeMillis()); - gc.add(Calendar.HOUR_OF_DAY, 12); - if (d.getTime() > gc.getTimeInMillis()) { + DayDate d = new DayDate(DateSelector.getDateFormat().parse(date).getTime()); + if (d.start().getTime() > System.currentTimeMillis()) { gae.mergeInto(new GigiApiException("You must not enter a date in the future.")); } + Calendar gc = GregorianCalendar.getInstance(); gc.setTimeInMillis(System.currentTimeMillis()); gc.add(Calendar.MONTH, -LIMIT_MAX_MONTHS_VERIFICATION); if (d.getTime() < gc.getTimeInMillis()) {