UPD: Factor out PingConfig objects and pingconfig-form.

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

diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.java b/src/org/cacert/gigi/pages/account/DomainAddForm.java
index 65e168c4f8ab5ecf671b67a833854418e9f96490..b220dca347e95a5505d84b0aaa0b319a59e7bf84 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainAddForm.java
+++ b/src/org/cacert/gigi/pages/account/DomainAddForm.java
@@ -1,24 +1,18 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Gigi;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.template.IterableDataset;
-import org.cacert.gigi.output.template.OutputableArrayIterable;
+import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
-import org.cacert.gigi.ping.SSLPinger;
-import org.cacert.gigi.util.RandomToken;
 
 public class DomainAddForm extends Form {
 
@@ -26,15 +20,12 @@ public class DomainAddForm extends Form {
 
     private User target;
 
-    private String tokenName = RandomToken.generateToken(8);
+    PingconfigForm pcf;
 
-    private String tokenValue = RandomToken.generateToken(16);
-
-    private static final int MAX_SSL_TESTS = 4;
-
-    public DomainAddForm(HttpServletRequest hsr, User target) {
+    public DomainAddForm(HttpServletRequest hsr, User target) throws GigiApiException {
         super(hsr);
         this.target = target;
+        pcf = new PingconfigForm(hsr, null);
     }
 
     @Override
@@ -46,35 +37,8 @@ public class DomainAddForm extends Form {
             }
             Domain d = new Domain(target, parameter);
             d.insert();
-            if (req.getParameter("emailType") != null) {
-                String mail = AUTHORATIVE_EMAILS[Integer.parseInt(req.getParameter("email"))];
-                d.addPing("email", mail);
-            }
-            if (req.getParameter("DNSType") != null) {
-                d.addPing("dns", tokenName + ":" + tokenValue);
-            }
-            if (req.getParameter("HTTPType") != null) {
-                d.addPing("http", tokenName + ":" + tokenValue);
-            }
-            if (req.getParameter("SSLType") != null) {
-                List<String> types = Arrays.asList(SSLPinger.TYPES);
-                for (int i = 0; i < MAX_SSL_TESTS; i++) {
-                    String type = req.getParameter("ssl-type-" + i);
-                    String port = req.getParameter("ssl-port-" + i);
-                    if (type == null || port == null || port.equals("")) {
-                        continue;
-                    }
-                    int portInt = Integer.parseInt(port);
-                    if ("direct".equals(type)) {
-                        d.addPing("ssl", port);
-                    } else if (types.contains(type)) {
-                        d.addPing("ssl", portInt + ":" + type);
-                    }
-
-                }
-            }
-            Gigi.notifyPinger();
-
+            pcf.setTarget(d);
+            pcf.submit(out, req);
             return true;
         } catch (NumberFormatException e) {
             new GigiApiException("A number could not be parsed").format(out, Page.getLanguage(req));
@@ -85,27 +49,13 @@ public class DomainAddForm extends Form {
         }
     }
 
-    public static final String[] AUTHORATIVE_EMAILS = new String[] {
-            "root", "hostmaster", "postmaster", "admin", "webmaster"
-    };
-
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        vars.put("tokenName", tokenName);
-        vars.put("tokenValue", tokenValue);
-        vars.put("authEmails", new OutputableArrayIterable(AUTHORATIVE_EMAILS, "email"));
-        vars.put("ssl-services", new IterableDataset() {
-
-            int counter = 0;
+        vars.put("pingconfig", new Outputable() {
 
             @Override
-            public boolean next(Language l, Map<String, Object> vars) {
-                if (counter >= MAX_SSL_TESTS) {
-                    return false;
-                }
-                vars.put("i", counter);
-                counter++;
-                return true;
+            public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+                pcf.outputEmbeddableContent(out, l, vars);
             }
         });
         t.output(out, l, vars);