X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2FVerify.java;h=0c8485420208067b74aaeae436e6e972da5d1b96;hb=1e5293e284e84388dd13fcddb4b48d99986426b5;hp=5f8aa8f976a0f9e5bf06aeb303d72e6fb871c941;hpb=5725fc461f2f5d3d767a9d2d445eff96857287a5;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/org/cacert/gigi/pages/Verify.java
index 5f8aa8f9..0c848542 100644
--- a/src/org/cacert/gigi/pages/Verify.java
+++ b/src/org/cacert/gigi/pages/Verify.java
@@ -2,41 +2,120 @@ package org.cacert.gigi.pages;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.Verifyable;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.SprintfCommand;
 
 public class Verify extends Page {
-	public static final String PATH = "/verify";
-
-	public Verify() {
-		super("Verify email");
-	}
-
-	@Override
-	public boolean needsLogin() {
-		return false;
-	}
-
-	@Override
-	public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-		PrintWriter out = resp.getWriter();
-		String hash = req.getParameter("hash");
-		String type = req.getParameter("type");
-		String id = req.getParameter("id");
-		if ("email".equals(type)) {
-			try {
-				EmailAddress ea = EmailAddress.getById(Integer.parseInt(id));
-				ea.verify(hash);
-				out.println("Email verification completed.");
-			} catch (IllegalArgumentException e) {
-				out.println(translate(req, "The email address is invalid."));
-			} catch (GigiApiException e) {
-				e.format(out, getLanguage(req));
-			}
-		}
-	}
+
+    private static final SprintfCommand emailAddressVerified = new SprintfCommand("Email address ${subject} verified");
+
+    private static final SprintfCommand domainVerified = new SprintfCommand("Domain ${subject} verified");
+
+    private class VerificationForm extends Form {
+
+        private String hash;
+
+        private String type;
+
+        private String id;
+
+        private Verifyable target;
+
+        String subject;
+
+        public VerificationForm(HttpServletRequest hsr) {
+            super(hsr, PATH);
+            hash = hsr.getParameter("hash");
+            type = hsr.getParameter("type");
+            id = hsr.getParameter("id");
+            if ("email".equals(type)) {
+                EmailAddress addr = EmailAddress.getById(Integer.parseInt(id));
+                subject = addr.getAddress();
+                target = addr;
+            } else if ("domain".equals(type)) {
+                Domain domain = Domain.getById(Integer.parseInt(id));
+                subject = domain.getSuffix();
+                target = domain;
+            }
+        }
+
+        @Override
+        public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("subject", subject);
+            if ("email".equals(type)) {
+                try {
+                    target.verify(hash);
+                    emailAddressVerified.output(out, getLanguage(req), data);
+                } catch (IllegalArgumentException e) {
+                    out.println(translate(req, "The email address is invalid."));
+                } catch (GigiApiException e) {
+                    e.format(out, getLanguage(req));
+                }
+            } else if ("domain".equals(type)) {
+                try {
+                    target.verify(hash);
+                    domainVerified.output(out, getLanguage(req), data);
+                } catch (IllegalArgumentException e) {
+                    out.println(translate(req, "The domain is invalid."));
+                } catch (GigiApiException e) {
+                    e.format(out, getLanguage(req));
+                }
+            }
+            return true;
+        }
+
+        @Override
+        protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
+            vars.put("hash", hash);
+            vars.put("id", id);
+            vars.put("type", type);
+
+            vars.put("subject", subject);
+            getDefaultTemplate().output(out, l, vars);
+        }
+    }
+
+    public static final String PATH = "/verify";
+
+    public Verify() {
+        super("Verify email");
+    }
+
+    @Override
+    public boolean needsLogin() {
+        return false;
+    }
+
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            if (Form.getForm(req, VerificationForm.class).submit(resp.getWriter(), req)) {
+            }
+        } catch (GigiApiException e) {
+            e.format(resp.getWriter(), getLanguage(req));
+        }
+    }
+
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            new VerificationForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        } catch (IllegalArgumentException e) {
+            resp.getWriter().println(translate(req, "The object to verify is invalid."));
+
+        }
+    }
 
 }