X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FUser.java;h=a7e6357667e24caa425c17a5c40e26fb5d0ffdf1;hb=0a814fdf958fab3f77d7d9d5333ad4307f7c9b8c;hp=bf47552ac56a7b3e7285eefe20588f895e8aa984;hpb=79e4e5abf2c48fdf6dd07c7278e99f93cde5f59d;p=gigi.git

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java
index bf47552a..a7e63576 100644
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/User.java
@@ -11,10 +11,8 @@ import org.cacert.gigi.util.PasswordHash;
 public class User {
 
 	private int id;
-	String fname;
-	String mname;
-	String lname;
-	String suffix;
+	Name name = new Name(null, null);
+
 	Date dob;
 	String email;
 
@@ -22,12 +20,12 @@ public class User {
 		this.id = id;
 		try {
 			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-					"SELECT `fname`, `lname` FROM `users` WHERE id=?");
+					"SELECT `fname`, `lname`, `dob` FROM `users` WHERE id=?");
 			ps.setInt(1, id);
 			ResultSet rs = ps.executeQuery();
 			if (rs.next()) {
-				fname = rs.getString(1);
-				lname = rs.getString(2);
+				name = new Name(rs.getString(1), rs.getString(2));
+				dob = rs.getDate(3);
 			}
 			rs.close();
 		} catch (SQLException e) {
@@ -40,22 +38,25 @@ public class User {
 		return id;
 	}
 	public String getFname() {
-		return fname;
+		return name.fname;
 	}
 	public String getLname() {
-		return lname;
+		return name.lname;
 	}
 	public String getMname() {
-		return mname;
+		return name.mname;
+	}
+	public Name getName() {
+		return name;
 	}
 	public void setMname(String mname) {
-		this.mname = mname;
+		this.name.mname = mname;
 	}
 	public String getSuffix() {
-		return suffix;
+		return name.suffix;
 	}
 	public void setSuffix(String suffix) {
-		this.suffix = suffix;
+		this.name.suffix = suffix;
 	}
 	public Date getDob() {
 		return dob;
@@ -73,10 +74,10 @@ public class User {
 		this.id = id;
 	}
 	public void setFname(String fname) {
-		this.fname = fname;
+		this.name.fname = fname;
 	}
 	public void setLname(String lname) {
-		this.lname = lname;
+		this.name.lname = lname;
 	}
 	public void insert(String password) throws SQLException {
 		if (id != 0) {
@@ -88,10 +89,10 @@ public class User {
 						+ "`suffix`=?, `dob`=?, `created`=NOW(), locked=0");
 		query.setString(1, email);
 		query.setString(2, PasswordHash.hash(password));
-		query.setString(3, fname);
-		query.setString(4, mname);
-		query.setString(5, lname);
-		query.setString(6, suffix);
+		query.setString(3, name.fname);
+		query.setString(4, name.mname);
+		query.setString(5, name.lname);
+		query.setString(6, name.suffix);
 		query.setDate(7, new java.sql.Date(dob.getTime()));
 		query.execute();
 		id = DatabaseConnection.lastInsertId(query);