upd: use a more strict pattern for handling forms

[gigi.git] / src / org / cacert / gigi / pages / account / domain / PingConfigForm.java

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
index 5a13482f6221e87123745cc44534f48b6cdfed21..6c3ca4002981a42234a4dd80ddb19030497a7e74 100644 (file)
--- 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 boolean 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 true;
     }
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        out.print("<table class=\"wrapper dataTable\"><tbody>");
+        vars.put("notEmbedded", true);
         outputEmbeddableContent(out, l, vars);
-        out.print("<tr><td></td><td><input type=\"submit\" value=\"Update\"/></td></tbody></table>");
     }
 
     protected void outputEmbeddableContent(PrintWriter out, Language l, Map<String, Object> vars) {
         vars.put("tokenName", tokenName);
         vars.put("tokenValue", tokenValue);
+        vars.put("openSSLHelp", "<code>" + HTMLEncoder.encodeHTML("-subj \"/CN=<domain>/OU=" + tokenValue + "\"") + "</code>");
         vars.put("authEmails", new IterableDataset() {
 
             int i = 0;