Merge branch 'ant_build'

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

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 007a58a60c10be233235159f2629adb6e8afb027..b13b374fbae105f5fcb2ed864eed8670e1c632b5 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -10,6 +10,7 @@ import java.util.Date;
 import java.util.HashMap;
 
 import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
@@ -61,7 +62,7 @@ public class Signup {
                                                "</a>"));
                t.output(out, l, vars);
        }
-       private void update(ServletRequest r) {
+       private void update(HttpServletRequest r) {
                if (r.getParameter("fname") != null) {
                        buildup.setFname(r.getParameter("fname"));
                }
@@ -81,9 +82,10 @@ public class Signup {
                country = "1".equals(r.getParameter("country"));
                regional = "1".equals(r.getParameter("regional"));
                radius = "1".equals(r.getParameter("radius"));
+               myDoB.update(r);
        }
 
-       public boolean submit(PrintWriter out, ServletRequest req) {
+       public boolean submit(PrintWriter out, HttpServletRequest req) {
                update(req);
                boolean failed = false;
                out.println("<div class='formError'>");
@@ -95,6 +97,11 @@ public class Signup {
                        outputError(out, req, "Invalid date of birth");
                        failed = true;
                }
+               if (!"1".equals(req.getParameter("cca_agree"))) {
+                       outputError(out, req,
+                                       "You have to agree to the CAcert Community agreement.");
+                       failed = true;
+               }
                if (buildup.getEmail().equals("")) {
                        outputError(out, req, "Email Address was blank");
                        failed = true;
@@ -109,6 +116,10 @@ public class Signup {
                        failed = true;
                }
                // TODO check password strength
+               if (failed) {
+                       out.println("</div>");
+                       return false;
+               }
                try {
                        PreparedStatement q1 = DatabaseConnection.getInstance().prepare(
                                        "select * from `email` where `email`=? and `deleted`=0");
@@ -147,8 +158,14 @@ public class Signup {
                        e.printStackTrace();
                        failed = true;
                }
+               // TODO fast-check mail
+
                out.println("</div>");
-               return failed;
+               if (failed) {
+                       return false;
+               }
+               // TODO start getting to work
+               return true;
        }
        private void outputError(PrintWriter out, ServletRequest req, String text) {
                out.print("<div>");