fix: allow assurance in +12 hours (due to date/timezone issues)

[gigi.git] / src / org / cacert / gigi / util / Notary.java

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index 767230b0a82dfd470af7b356500a07dff3b8a056..3823cf7d008c6b390c846cb2d779765720df799a 100644 (file)
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -1,7 +1,9 @@
 package org.cacert.gigi.util;
 
 import java.text.ParseException;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
@@ -15,11 +17,11 @@ import org.cacert.gigi.output.DateSelector;
 public class Notary {
 
     public static void writeUserAgreement(User member, String document, String method, String comment, boolean active, int secmemid) {
-        GigiPreparedStatement q = DatabaseConnection.getInstance().prepare("insert into `user_agreements` set `memid`=?, `secmemid`=?," + " `document`=?,`date`=NOW(), `active`=?,`method`=?,`comment`=?");
+        GigiPreparedStatement q = DatabaseConnection.getInstance().prepare("INSERT INTO `user_agreements` SET `memid`=?, `secmemid`=?," + " `document`=?,`date`=NOW(), `active`=?,`method`=?,`comment`=?");
         q.setInt(1, member.getId());
         q.setInt(2, secmemid);
         q.setString(3, document);
-        q.setInt(4, active ? 1 : 0);
+        q.setBoolean(4, active);
         q.setString(5, method);
         q.setString(6, comment);
         q.execute();
@@ -85,7 +87,10 @@ public class Notary {
         } else {
             try {
                 Date d = DateSelector.getDateFormat().parse(date);
-                if (d.getTime() > System.currentTimeMillis()) {
+                Calendar gc = GregorianCalendar.getInstance();
+                gc.setTimeInMillis(System.currentTimeMillis());
+                gc.add(Calendar.HOUR_OF_DAY, 12);
+                if (d.getTime() > gc.getTimeInMillis()) {
                     gae.mergeInto(new GigiApiException("You must not enter a date in the future."));
                 }
             } catch (ParseException e) {