Merge branch 'ant_build'

[gigi.git] / src / org / cacert / gigi / pages / main / RegisterPage.java

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index b63dbce1612fb6f4ee0de86d3f6ee95b27cd63cc..502f979d5983ae642657a4711e7e65d95397e714 100644 (file)
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -6,8 +6,10 @@ import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
 import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.Page;
 
@@ -28,17 +30,33 @@ public class RegisterPage extends Page {
        }
 
        @Override
-       public void doGet(HttpServletRequest req, ServletResponse resp)
+       public void doGet(HttpServletRequest req, HttpServletResponse resp)
                        throws IOException {
                PrintWriter out = resp.getWriter();
                t.output(out, getLanguage(req), new HashMap<String, Object>());
-               Signup s = new Signup();
-               s.writeForm(out, req);
+               Signup s = getForm(req);
+               s.writeForm(out, getLanguage(req));
+       }
+       public Signup getForm(HttpServletRequest req) {
+               HttpSession hs = req.getSession();
+               Signup s = (Signup) hs.getAttribute("signupProcess");
+               if (s == null) {
+                       s = new Signup();
+                       hs.setAttribute("signupProcess", s);
+               }
+               return s;
+
        }
        @Override
-       public void doPost(HttpServletRequest req, ServletResponse resp)
+       public void doPost(HttpServletRequest req, HttpServletResponse resp)
                        throws IOException {
+               Signup s = getForm(req);
+               s.submit(resp.getWriter(), req);
 
                super.doPost(req, resp);
        }
+       @Override
+       public boolean needsLogin() {
+               return false;
+       }
 }