From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 26 Jun 2014 15:53:49 +0000 (+0200)
Subject: Make "RegisterPage" a "Form"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=d463b3c42abe2f8edda3951580cf339dca6bb58e

Make "RegisterPage" a "Form"
---

diff --git a/src/org/cacert/gigi/output/Form.java b/src/org/cacert/gigi/output/Form.java
new file mode 100644
index 00000000..1aa356ab
--- /dev/null
+++ b/src/org/cacert/gigi/output/Form.java
@@ -0,0 +1,10 @@
+package org.cacert.gigi.output;
+
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface Form extends Outputable {
+	public boolean submit(PrintWriter out, HttpServletRequest req);
+
+}
diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index f552189f..b3819499 100644
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -23,10 +23,10 @@ public class RegisterPage extends Page {
 	public void doGet(HttpServletRequest req, HttpServletResponse resp)
 			throws IOException {
 		PrintWriter out = resp.getWriter();
-		getDefaultTemplate().output(out, getLanguage(req),
-				new HashMap<String, Object>());
+		HashMap<String, Object> vars = new HashMap<String, Object>();
+		getDefaultTemplate().output(out, getLanguage(req), vars);
 		Signup s = getForm(req);
-		s.writeForm(out, getLanguage(req));
+		s.output(out, getLanguage(req), vars);
 	}
 	public Signup getForm(HttpServletRequest req) {
 		HttpSession hs = req.getSession();
diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 72a48e82..2a7ea912 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -9,6 +9,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -18,6 +19,7 @@ import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.DateSelector;
+import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
@@ -26,7 +28,7 @@ import org.cacert.gigi.util.PasswordStrengthChecker;
 import org.cacert.gigi.util.RandomToken;
 import org.cacert.gigi.util.ServerConstants;
 
-public class Signup {
+public class Signup implements Form {
 	User buildup = new User();
 	Template t;
 	boolean general = true, country = true, regional = true, radius = true;
@@ -46,7 +48,8 @@ public class Signup {
 	}
 	DateSelector myDoB = new DateSelector("day", "month", "year");
 
-	public void writeForm(PrintWriter out, Language l) {
+	public void output(PrintWriter out, Language l,
+			Map<String, Object> outerVars) {
 		HashMap<String, Object> vars = new HashMap<String, Object>();
 		vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFname()));
 		vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMname()));