X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fdomain%2FPingConfigForm.java;h=80ce8ff2e06bebac61203dcef1a9d9ea1b39a82c;hp=94a0cad0ca72e1c49160fdc03a8a93a93b61516d;hb=cc10b8bdcbe80e515cd3b8a3de893a5146ff8790;hpb=558fcecb74036f5d51aed13a784237c3d9703906 diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java index 94a0cad0..80ce8ff2 100644 --- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java +++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java @@ -17,6 +17,7 @@ import org.cacert.gigi.output.template.Form; import org.cacert.gigi.output.template.IterableDataset; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.ping.SSLPinger; +import org.cacert.gigi.util.HTMLEncoder; import org.cacert.gigi.util.RandomToken; public class PingConfigForm extends Form { @@ -50,7 +51,7 @@ public class PingConfigForm extends Form { private SSLType[] sslTypes = new SSLType[MAX_SSL_TESTS]; - private final Template t = new Template(PingConfigForm.class.getResource("PingConfigForm.templ")); + private static final Template t = new Template(PingConfigForm.class.getResource("PingConfigForm.templ")); public PingConfigForm(HttpServletRequest hsr, Domain target) throws GigiApiException { super(hsr); @@ -108,6 +109,7 @@ public class PingConfigForm extends Form { @Override public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException { + target.clearPings(); if (req.getParameter("emailType") != null && req.getParameter("email") != null) { try { String mail = AUTHORATIVE_EMAILS[Integer.parseInt(req.getParameter("email"))]; @@ -153,6 +155,7 @@ public class PingConfigForm extends Form { protected void outputEmbeddableContent(PrintWriter out, Language l, Map vars) { vars.put("tokenName", tokenName); vars.put("tokenValue", tokenValue); + vars.put("openSSLHelp", "" + HTMLEncoder.encodeHTML("-subj \"/CN=/OU=" + tokenValue + "\"") + ""); vars.put("authEmails", new IterableDataset() { int i = 0;