X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.java;h=66665af2163a89a387fbefbd3f69a9f18fe3a918;hb=280be756fb425fc8148ade698f51528e1e9106c2;hp=95cefd1e5a71aab6c5b0d23490a3b166fcf914ad;hpb=cd14b85c60f736a643842b421b11f41d8fca86c7;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 95cefd1e..66665af2 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,12 +37,9 @@ 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));
+        buildup.setDoB(new Date(0));
     }
 
     DateSelector myDoB = new DateSelector("day", "month", "year");
@@ -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()) {
@@ -141,7 +145,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)) {
@@ -175,7 +179,7 @@ public class Signup extends Form {
         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());