X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FCertificate.java;h=a9d1288283d639babe52d97f0789bf7980854333;hp=9d6d5d8d39f30a1fb36c04aa9fa377454749b5ed;hb=22f27f39d5b62ca5b264b2016daae7e870f78fd8;hpb=0c19a843c23f61cf32f555355a9fa1baf9c8f8f1

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index 9d6d5d8d..a9d12882 100644
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -17,6 +17,7 @@ import org.cacert.gigi.util.KeyStorage;
 
 public class Certificate {
 	private int id;
+	private int ownerId;
 	private int serial;
 	private String dn;
 	private String md;
@@ -24,7 +25,8 @@ public class Certificate {
 	private String crtName;
 	private String csr = null;
 
-	public Certificate(String dn, String md, String csr) {
+	public Certificate(int ownerId, String dn, String md, String csr) {
+		this.ownerId = ownerId;
 		this.dn = dn;
 		this.md = md;
 		this.csr = csr;
@@ -33,17 +35,19 @@ public class Certificate {
 	public Certificate(int id) {
 		try {
 			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-				"SELECT subject, md, csr_name, crt_name FROM `emailcerts` WHERE id=?");
+				"SELECT id,subject, md, csr_name, crt_name,memid FROM `emailcerts` WHERE serial=?");
 			ps.setInt(1, id);
 			ResultSet rs = ps.executeQuery();
 			if (!rs.next()) {
 				throw new IllegalArgumentException("Invalid mid " + id);
 			}
-			this.id = id;
-			dn = rs.getString(1);
-			md = rs.getString(2);
-			csrName = rs.getString(3);
-			crtName = rs.getString(4);
+			this.id = rs.getInt(1);
+			dn = rs.getString(2);
+			md = rs.getString(3);
+			csrName = rs.getString(4);
+			crtName = rs.getString(5);
+			ownerId = rs.getInt(6);
+			serial = id;
 			rs.close();
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -135,9 +139,10 @@ public class Certificate {
 				throw new IllegalStateException();
 			}
 			PreparedStatement inserter = DatabaseConnection.getInstance().prepare(
-				"INSERT INTO emailcerts SET md=?, subject=?, coll_found=0, crt_name=''");
+				"INSERT INTO emailcerts SET md=?, subject=?, coll_found=0, crt_name='', memid=?");
 			inserter.setString(1, md);
 			inserter.setString(2, dn);
+			inserter.setInt(3, ownerId);
 			inserter.execute();
 			id = DatabaseConnection.lastInsertId(inserter);
 			File csrFile = KeyStorage.locateCsr(id);
@@ -222,4 +227,8 @@ public class Certificate {
 		return md;
 	}
 
+	public int getOwnerId() {
+		return ownerId;
+	}
+
 }