X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fdomain%2FPingConfigForm.java;h=6d23c3a0a14ea4fbe0732cf9069bfc3cb2bece3d;hp=5a13482f6221e87123745cc44534f48b6cdfed21;hb=abff88a2bf173198fe55c35ead97c9c7cdb5924c;hpb=25f59f370978c0e9789821a15d89a83d5d702622 diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java index 5a13482f..6d23c3a0 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 { @@ -107,7 +108,7 @@ public class PingConfigForm extends Form { } @Override - public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException { + public SubmissionResult submit(HttpServletRequest req) throws GigiApiException { target.clearPings(); if (req.getParameter("emailType") != null && req.getParameter("email") != null) { try { @@ -141,19 +142,19 @@ public class PingConfigForm extends Form { } } Gigi.notifyPinger(null); - return false; + return new RedirectResult(req.getPathInfo()); } @Override protected void outputContent(PrintWriter out, Language l, Map vars) { - out.print(""); + vars.put("notEmbedded", true); outputEmbeddableContent(out, l, vars); - out.print("
"); } 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;