Empty: rename fname,mname,lname,dob

[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 a512a017ee9e48e886d3e21938549314097e9088..844a227b2d8707d40e11dedab664b21d2875ed7d 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -18,7 +18,7 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
@@ -36,12 +36,12 @@ public class Signup extends Form {
     public Signup(HttpServletRequest hsr) {
         super(hsr);
         t = new Template(Signup.class.getResource("Signup.templ"));
-        buildup.setFname("");
-        buildup.setMname("");
-        buildup.setLname("");
+        buildup.setFName("");
+        buildup.setMName("");
+        buildup.setLName("");
         buildup.setSuffix("");
         buildup.setEmail("");
-        buildup.setDob(new Date(0));
+        buildup.setDoB(new Date(0));
     }
 
     DateSelector myDoB = new DateSelector("day", "month", "year");
@@ -49,9 +49,9 @@ public class Signup extends Form {
     @Override
     public void outputContent(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()));
-        vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLname()));
+        vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFName()));
+        vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMName()));
+        vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLName()));
         vars.put("suffix", HTMLEncoder.encodeHTML(buildup.getSuffix()));
         vars.put("dob", myDoB);
         vars.put("email", HTMLEncoder.encodeHTML(buildup.getEmail()));
@@ -66,13 +66,13 @@ public class Signup extends Form {
 
     private void update(HttpServletRequest r) {
         if (r.getParameter("fname") != null) {
-            buildup.setFname(r.getParameter("fname"));
+            buildup.setFName(r.getParameter("fname"));
         }
         if (r.getParameter("lname") != null) {
-            buildup.setLname(r.getParameter("lname"));
+            buildup.setLName(r.getParameter("lname"));
         }
         if (r.getParameter("mname") != null) {
-            buildup.setMname(r.getParameter("mname"));
+            buildup.setMName(r.getParameter("mname"));
         }
         if (r.getParameter("suffix") != null) {
             buildup.setSuffix(r.getParameter("suffix"));
@@ -93,8 +93,8 @@ public class Signup extends Form {
     @Override
     public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
         update(req);
-        if (buildup.getFname().equals("") || buildup.getLname().equals("")) {
-            outputError(out, req, "First and/or last names were blank.");
+        if (buildup.getLName().trim().equals("")) {
+            outputError(out, req, "Last name were blank.");
         }
         if ( !myDoB.isValid()) {
             outputError(out, req, "Invalid date of birth");
@@ -119,8 +119,8 @@ public class Signup extends Form {
         if (isFailed(out)) {
             return false;
         }
-        GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted`=0");
-        GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from `users` where `email`=? and `deleted`=0");
+        GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted` IS NULL");
+        GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from certOwners inner join users on users.id=certOwners.id where `email`=? and `deleted` IS NULL");
         q1.setString(1, buildup.getEmail());
         q2.setString(1, buildup.getEmail());
         GigiResultSet r1 = q1.executeQuery();
@@ -141,7 +141,7 @@ public class Signup extends Form {
         r3.close();
         String mailResult = EmailProvider.FAIL;
         try {
-            mailResult = EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail());
+            mailResult = HTMLEncoder.encodeHTML(EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail()));
         } catch (IOException e) {
         }
         if ( !mailResult.equals(EmailProvider.OK)) {
@@ -164,15 +164,18 @@ public class Signup extends Form {
             run(req, pw1);
         } catch (SQLException e) {
             e.printStackTrace();
+        } catch (GigiApiException e) {
+            outputError(out, req, e.getMessage());
+            return false;
         }
         return true;
     }
 
-    private void run(HttpServletRequest req, String password) throws SQLException {
+    private void run(HttpServletRequest req, String password) throws SQLException, GigiApiException {
         try {
             DatabaseConnection.getInstance().beginTransaction();
             buildup.setPreferredLocale(Page.getLanguage(req).getLocale());
-            buildup.setDob(myDoB.getDate());
+            buildup.setDoB(myDoB.getDate());
             buildup.insert(password);
             int memid = buildup.getId();
             EmailAddress ea = new EmailAddress(buildup, buildup.getEmail());