X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Futil%2FNotary.java;h=a2dfe0f865953a83bc19956fd1d13028327b37be;hb=03d27b5bdaea6253e674cdf2779465873b657900;hp=2b1a2d923997d2b15c016a5a4deed5a1e898b026;hpb=30a66c84a3f33e99bd5cbfe50b25a83acfbf5425;p=gigi.git

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index 2b1a2d92..a2dfe0f8 100644
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -14,12 +14,12 @@ import org.cacert.gigi.output.DateSelector;
 
 public class Notary {
 
-    public static void writeUserAgreement(int memid, 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`=?");
-        q.setInt(1, memid);
+    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`=?");
+        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();
@@ -29,7 +29,7 @@ public class Notary {
         if (assurer.getId() == target.getId()) {
             throw new GigiApiException("You cannot assure yourself.");
         }
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `notary` where `to`=? and `from`=? AND `deleted`=0");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `notary` where `to`=? and `from`=? AND `deleted` IS NULL");
         ps.setInt(1, target.getId());
         ps.setInt(2, assurer.getId());
         GigiResultSet rs = ps.executeQuery();
@@ -105,7 +105,7 @@ public class Notary {
             gae.mergeInto(e);
         }
 
-        if ( !assuree.getName().equals(assureeName) || !assuree.getDob().equals(dob)) {
+        if ( !assuree.getName().equals(assureeName) || !assuree.getDoB().equals(dob)) {
             gae.mergeInto(new GigiApiException("The person you are assuring changed his personal details."));
         }
         if (awarded > assurer.getMaxAssurePoints() || awarded < 0) {