X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.java;h=a637f83d462c899ac668a1839e22e6bbda77f1bb;hb=03d27b5bdaea6253e674cdf2779465873b657900;hp=844a227b2d8707d40e11dedab664b21d2875ed7d;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 844a227b..a637f83d 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -14,6 +14,7 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
@@ -36,10 +37,7 @@ 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.setSuffix("");
+        buildup.setName(new Name("", "", "", ""));
         buildup.setEmail("");
         buildup.setDoB(new Date(0));
     }
@@ -49,10 +47,11 @@ 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("suffix", HTMLEncoder.encodeHTML(buildup.getSuffix()));
+        Name buildupName = buildup.getName();
+        vars.put("fname", HTMLEncoder.encodeHTML(buildupName.getFname()));
+        vars.put("mname", HTMLEncoder.encodeHTML(buildupName.getMname()));
+        vars.put("lname", HTMLEncoder.encodeHTML(buildupName.getLname()));
+        vars.put("suffix", HTMLEncoder.encodeHTML(buildupName.getSuffix()));
         vars.put("dob", myDoB);
         vars.put("email", HTMLEncoder.encodeHTML(buildup.getEmail()));
         vars.put("general", general ? " checked=\"checked\"" : "");
@@ -65,21 +64,26 @@ public class Signup extends Form {
     }
 
     private void update(HttpServletRequest r) {
+        String fname = buildup.getName().getFname();
+        String lname = buildup.getName().getLname();
+        String mname = buildup.getName().getMname();
+        String suffix = buildup.getName().getSuffix();
         if (r.getParameter("fname") != null) {
-            buildup.setFName(r.getParameter("fname"));
+            fname = r.getParameter("fname");
         }
         if (r.getParameter("lname") != null) {
-            buildup.setLName(r.getParameter("lname"));
+            lname = r.getParameter("lname");
         }
         if (r.getParameter("mname") != null) {
-            buildup.setMName(r.getParameter("mname"));
+            mname = r.getParameter("mname");
         }
         if (r.getParameter("suffix") != null) {
-            buildup.setSuffix(r.getParameter("suffix"));
+            suffix = r.getParameter("suffix");
         }
         if (r.getParameter("email") != null) {
             buildup.setEmail(r.getParameter("email"));
         }
+        buildup.setName(new Name(fname, lname, mname, suffix));
         general = "1".equals(r.getParameter("general"));
         country = "1".equals(r.getParameter("country"));
         regional = "1".equals(r.getParameter("regional"));
@@ -93,7 +97,7 @@ public class Signup extends Form {
     @Override
     public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
         update(req);
-        if (buildup.getLName().trim().equals("")) {
+        if (buildup.getName().getLname().trim().equals("")) {
             outputError(out, req, "Last name were blank.");
         }
         if ( !myDoB.isValid()) {
@@ -119,8 +123,8 @@ public class Signup extends Form {
         if (isFailed(out)) {
             return false;
         }
-        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");
+        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();
@@ -130,7 +134,7 @@ public class Signup extends Form {
         }
         r1.close();
         r2.close();
-        GigiPreparedStatement q3 = DatabaseConnection.getInstance().prepare("select `domain` from `baddomains` where `domain`=RIGHT(?, LENGTH(`domain`))");
+        GigiPreparedStatement q3 = DatabaseConnection.getInstance().prepare("SELECT `domain` FROM `baddomains` WHERE `domain`=RIGHT(?, LENGTH(`domain`))");
         q3.setString(1, buildup.getEmail());
 
         GigiResultSet r3 = q3.executeQuery();
@@ -181,12 +185,12 @@ public class Signup extends Form {
             EmailAddress ea = new EmailAddress(buildup, buildup.getEmail());
             ea.insert(Page.getLanguage(req));
 
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("insert into `alerts` set `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?");
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `alerts` SET `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?");
             ps.setInt(1, memid);
-            ps.setString(2, general ? "1" : "0");
-            ps.setString(3, country ? "1" : "0");
-            ps.setString(4, regional ? "1" : "0");
-            ps.setString(5, radius ? "1" : "0");
+            ps.setBoolean(2, general);
+            ps.setBoolean(3, country);
+            ps.setBoolean(4, regional);
+            ps.setBoolean(5, radius);
             ps.execute();
             Notary.writeUserAgreement(buildup, "CCA", "account creation", "", true, 0);