X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificates.java;h=775f527d993989b27d6653e9eab5bcc50c17cefb;hp=ed8661708464bff6696e5b469688fefd9b2e7dfa;hb=55eabf9c9f1e5479673071727b76eb908019fec4;hpb=081aaab69d87705ed2aec541fb936df7850bf09b
diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/MailCertificates.java
index ed866170..775f527d 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificates.java
@@ -2,6 +2,7 @@ package org.cacert.gigi.pages.account;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URLEncoder;
import java.security.GeneralSecurityException;
import java.security.cert.X509Certificate;
import java.sql.PreparedStatement;
@@ -17,6 +18,7 @@ import org.cacert.gigi.Certificate;
import org.cacert.gigi.User;
import org.cacert.gigi.database.DatabaseConnection;
import org.cacert.gigi.output.CertificateTable;
+import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.util.PEM;
@@ -25,6 +27,8 @@ public class MailCertificates extends Page {
CertificateTable myTable = new CertificateTable("mailcerts");
+ Template certDisplay = new Template(MailCertificates.class.getResource("CertificateDisplay.templ"));
+
public static final String PATH = "/account/certs/email";
public MailCertificates() {
@@ -99,33 +103,17 @@ public class MailCertificates extends Page {
resp.sendError(404);
return;
}
- out.print("");
- out.print(translate(req, "PEM encoded Certificate"));
- out.println("
");
-
- out.print("");
- out.print(translate(req, "DER encoded Certificate"));
- out.println("
");
- out.print("");
- out.print(translate(req, "Install into browser."));
- out.println("
");
-
- out.println("
"); + HashMap"); + certDisplay.output(out, getLanguage(req), vars); + return; }vars = new HashMap<>(); + vars.put("serial", URLEncoder.encode(serial, "UTF-8")); try { - X509Certificate cert = c.cert(); - out.print(cert); + vars.put("cert", c.cert()); } catch (GeneralSecurityException e) { e.printStackTrace(); } catch (SQLException e) { e.printStackTrace(); } - out.println("