X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificateAdd.java;h=836f48c4f13c1ff1e035ff5a9f7accb4d20ee1e8;hb=3eecb2d9825692b4af04ea96372fd03de54809f1;hp=fe93959da6493118dd312c466e7441065ac43ec6;hpb=e9336bb2781a287a5542179208a869acd17c9a5a;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
index fe93959d..836f48c4 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.Certificate;
 import org.cacert.gigi.output.ClientCSRGenerate;
+import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 
 public class MailCertificateAdd extends Page {
@@ -20,19 +21,16 @@ public class MailCertificateAdd extends Page {
 	}
 
 	@Override
-	public void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws IOException {
+	public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 		HashMap<String, Object> vars = new HashMap<String, Object>();
-		vars.put("CCA",
-				"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
+		vars.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
 		getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
 	}
+
 	@Override
-	public void doPost(HttpServletRequest req, HttpServletResponse resp)
-			throws IOException {
+	public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 		PrintWriter out = resp.getWriter();
-		if (req.getParameter("optionalCSR") == null
-				|| req.getParameter("optionalCSR").equals("")) {
+		if (req.getParameter("optionalCSR") == null || req.getParameter("optionalCSR").equals("")) {
 			out.println("csr missing");
 			ClientCSRGenerate.output(req, resp);
 		}
@@ -41,12 +39,11 @@ public class MailCertificateAdd extends Page {
 			// Error.
 			return;
 		}
-		Certificate c = new Certificate("/commonName=CAcert WoT User",
-				"sha256", csr);
+		Certificate c = new Certificate(LoginPage.getUser(req).getId(), "/commonName=CAcert WoT User", "sha256", csr);
 		c.issue();
 		try {
 			c.waitFor(60000);
-			resp.sendRedirect(MailCertificates.PATH + "/" + c.getId());
+			resp.sendRedirect(MailCertificates.PATH + "/" + c.getSerial());
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} catch (InterruptedException e) {