upd: Beautify up the verification form.

[gigi.git] / src / org / cacert / gigi / pages / Verify.java

diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/org/cacert/gigi/pages/Verify.java
index a1d613a744346984602f33444889fb086eec662b..cdcf490fa01cb58d29d497b0e1c15055d65c310c 100644 (file)
--- a/src/org/cacert/gigi/pages/Verify.java
+++ b/src/org/cacert/gigi/pages/Verify.java
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 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;
 
@@ -24,19 +25,25 @@ public class Verify extends Page {
 
         private String id;
 
+        private Verifyable target;
+
         public VerificationForm(HttpServletRequest hsr) {
             super(hsr, PATH);
             hash = hsr.getParameter("hash");
             type = hsr.getParameter("type");
             id = hsr.getParameter("id");
+            if ("email".equals(type)) {
+                target = EmailAddress.getById(Integer.parseInt(id));
+            } else if ("domain".equals("type")) {
+                target = Domain.getById(Integer.parseInt(id));
+            }
         }
 
         @Override
         public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
             if ("email".equals(type)) {
                 try {
-                    EmailAddress ea = EmailAddress.getById(Integer.parseInt(id));
-                    ea.verify(hash);
+                    target.verify(hash);
                     out.println("Email verification completed.");
                 } catch (IllegalArgumentException e) {
                     out.println(translate(req, "The email address is invalid."));
@@ -45,11 +52,10 @@ public class Verify extends Page {
                 }
             } else if ("domain".equals(type)) {
                 try {
-                    Domain ea = Domain.getById(Integer.parseInt(id));
-                    ea.verify(hash);
+                    target.verify(hash);
                     out.println("Domain verification completed.");
                 } catch (IllegalArgumentException e) {
-                    out.println(translate(req, "The domain address is invalid."));
+                    out.println(translate(req, "The domain is invalid."));
                 } catch (GigiApiException e) {
                     e.format(out, getLanguage(req));
                 }
@@ -62,9 +68,13 @@ public class Verify extends Page {
             vars.put("hash", hash);
             vars.put("id", id);
             vars.put("type", type);
+            if (target instanceof EmailAddress) {
+                vars.put("subject", ((EmailAddress) target).getAddress());
+            } else if (target instanceof Domain) {
+                vars.put("subject", ((Domain) target).getSuffix());
+            }
             getDefaultTemplate().output(out, l, vars);
         }
-
     }
 
     public static final String PATH = "/verify";
@@ -90,7 +100,12 @@ public class Verify extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        new VerificationForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        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."));
+
+        }
     }
 
 }