add: split API and add CATS import API

[gigi.git] / src / org / cacert / gigi / dbObjects / User.java

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 72c26c237980006d8438382e0a8b5c430f11ba69..8d1d40fc45b55b1da27289e1105ef452030b01e4 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -98,10 +98,6 @@ public class User extends CertificateOwner {
         return email;
     }
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
     public void changePassword(String oldPass, String newPass) throws GigiApiException {
         GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM `users` WHERE `id`=?");
         ps.setInt(1, getId());
@@ -138,8 +134,9 @@ public class User extends CertificateOwner {
     }
 
     public boolean hasPassedCATS() {
-        GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=? AND `variant_id`=1");
+        GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `cats_passed` where `user_id`=? AND `variant_id`=?");
         query.setInt(1, getId());
+        query.setInt(2, CATS.ASSURER_CHALLANGE_ID);
         try (GigiResultSet rs = query.executeQuery()) {
             if (rs.next()) {
                 return true;