X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FRegisterPage.java;h=e243c2875f92e826ac4ed21acb5adbaabed894b7;hb=872e9a7ac8a8a143fe63e178e349663fb524d9d7;hp=b63dbce1612fb6f4ee0de86d3f6ee95b27cd63cc;hpb=06c5d96d7dc2df71a1658e1c7c9e34ad065d10d7;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index b63dbce1..e243c287 100644
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -1,44 +1,59 @@
 package org.cacert.gigi.pages.main;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import org.cacert.gigi.output.Template;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+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";
-	Template t;
 
 	public RegisterPage() {
 		super("Register");
-		try {
-			t = new Template(new InputStreamReader(
-					Signup.class.getResourceAsStream("RegisterPage.templ"),
-					"UTF-8"));
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
 	}
 
 	@Override
-	public void doGet(HttpServletRequest req, ServletResponse resp)
-			throws IOException {
+	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();
-		t.output(out, getLanguage(req), new HashMap<String, Object>());
-		Signup s = new Signup();
-		s.writeForm(out, req);
+		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, ServletResponse resp)
-			throws IOException {
+	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);
+	}
 
-		super.doPost(req, resp);
+	@Override
+	public boolean needsLogin() {
+		return false;
 	}
 }