[DB]: Add orgAdmin management code

[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 2b1a2d923997d2b15c016a5a4deed5a1e898b026..3dfc4faab5700647bb8ba0ecee6113fab6ebde2d 100644 (file)
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -14,9 +14,9 @@ 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) {
+    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, memid);
+        q.setInt(1, member.getId());
         q.setInt(2, secmemid);
         q.setString(3, document);
         q.setInt(4, active ? 1 : 0);
@@ -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();