X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FRegisterPage.java;h=55d44ed79c26d190bb7adf5f80d796cab3f18931;hp=b38194994bb69044907a3f3910feaae618482311;hb=e409ba881965634f63f0b67824bc93dda4ec4327;hpb=d463b3c42abe2f8edda3951580cf339dca6bb58e

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index b3819499..55d44ed7 100644
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -8,58 +8,55 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 
 public class RegisterPage extends Page {
 
-	private static final String SIGNUP_PROCESS = "signupProcess";
-	public static final String PATH = "/register";
-
-	public RegisterPage() {
-		super("Register");
-	}
-
-	@Override
-	public void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws IOException {
-		PrintWriter out = resp.getWriter();
-		HashMap<String, Object> vars = new HashMap<String, Object>();
-		getDefaultTemplate().output(out, getLanguage(req), vars);
-		Signup s = getForm(req);
-		s.output(out, getLanguage(req), vars);
-	}
-	public Signup getForm(HttpServletRequest req) {
-		HttpSession hs = req.getSession();
-		Signup s = (Signup) hs.getAttribute(SIGNUP_PROCESS);
-		if (s == null) {
-			s = new Signup();
-			hs.setAttribute(SIGNUP_PROCESS, s);
-		}
-		return s;
-
-	}
-	@Override
-	public void doPost(HttpServletRequest req, HttpServletResponse resp)
-			throws IOException {
-		Signup s = getForm(req);
-		if (s.submit(resp.getWriter(), req)) {
-			HttpSession hs = req.getSession();
-			hs.setAttribute(SIGNUP_PROCESS, null);
-			resp.getWriter()
-					.println(
-							translate(
-									req,
-									"Your information has been submitted"
-											+ " into our system. You will now be sent an email with a web link,"
-											+ " you need to open that link in your web browser within 24 hours"
-											+ " or your information will be removed from our system!"));
-			return;
-		}
-
-		super.doPost(req, resp);
-	}
-	@Override
-	public boolean needsLogin() {
-		return false;
-	}
+    private static final String SIGNUP_PROCESS = "signupProcess";
+
+    public static final String PATH = "/register";
+
+    public RegisterPage() {
+        super("Register");
+    }
+
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        Signup s = new Signup(req);
+        outputGet(req, resp, s);
+    }
+
+    private void outputGet(HttpServletRequest req, HttpServletResponse resp, Signup s) throws IOException {
+        PrintWriter out = resp.getWriter();
+        HashMap<String, Object> vars = new HashMap<String, Object>();
+        getDefaultTemplate().output(out, getLanguage(req), vars);
+        s.output(out, getLanguage(req), vars);
+    }
+
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        Signup s = Form.getForm(req, Signup.class);
+        if (s == null) {
+            resp.getWriter().println(translate(req, "CSRF token check failed."));
+        } else if (s.submit(resp.getWriter(), req)) {
+            HttpSession hs = req.getSession();
+            hs.setAttribute(SIGNUP_PROCESS, null);
+            resp.getWriter().println(translate(req, "Your information has been submitted" + " into our system. You will now be sent an email with a web link," + " you need to open that link in your web browser within 24 hours" + " or your information will be removed from our system!"));
+            return;
+        }
+
+        outputGet(req, resp, s);
+    }
+
+    @Override
+    public boolean needsLogin() {
+        return false;
+    }
+
+    @Override
+    public boolean isPermitted(User u) {
+        return u == null;
+    }
 }