X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.java;h=07cd608400a2fb83c298ab2486cdbdfadc18be69;hb=a793cf333e23cba27e2ce4378becc0426f1e186a;hp=6f2bf6efd0fabec27c30c4b474d8888ad0b1e807;hpb=3e123160ad59a2e1162518923965562ff947b6d1;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 6f2bf6ef..07cd6084 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -119,8 +119,8 @@ public class Signup extends Form {
         if (isFailed(out)) {
             return false;
         }
-        GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted`=0");
-        GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from `users` where `email`=? and `deleted`=0");
+        GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted` IS NULL");
+        GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from certOwners inner join users on users.id=certOwners.id where `email`=? and `deleted` IS NULL");
         q1.setString(1, buildup.getEmail());
         q2.setString(1, buildup.getEmail());
         GigiResultSet r1 = q1.executeQuery();
@@ -185,7 +185,7 @@ public class Signup extends Form {
             ps.setString(4, regional ? "1" : "0");
             ps.setString(5, radius ? "1" : "0");
             ps.execute();
-            Notary.writeUserAgreement(memid, "CCA", "account creation", "", true, 0);
+            Notary.writeUserAgreement(buildup, "CCA", "account creation", "", true, 0);
 
             DatabaseConnection.getInstance().commitTransaction();
         } finally {