Move the "dbObject"s to their own package.

[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 5f8aa8f976a0f9e5bf06aeb303d72e6fb871c941..2ebd54c5f2d4447ae9fe5a8352a05c53229c8300 100644 (file)
--- a/src/org/cacert/gigi/pages/Verify.java
+++ b/src/org/cacert/gigi/pages/Verify.java
@@ -2,41 +2,54 @@ package org.cacert.gigi.pages;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+
 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;
 
 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));
-                       }
-               }
-       }
+
+    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));
+            }
+        } else if ("domain".equals(type)) {
+            try {
+                Domain ea = Domain.getById(Integer.parseInt(id));
+                ea.verify(hash);
+                out.println("Domain verification completed.");
+            } catch (IllegalArgumentException e) {
+                out.println(translate(req, "The domain address is invalid."));
+            } catch (GigiApiException e) {
+                e.format(out, getLanguage(req));
+            }
+        }
+    }
 
 }