X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.java;h=bd4037a1d5c8e9fa18ecfc2418ef789de2b97291;hp=f4ba0c1b99e022677fb868fb5aaf8bf93df0a325;hb=70ac38c2e844e293d9815b8703341b94b029977a;hpb=b0ab4664edfc6ee90b658bfa662a54dec42879b3

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index f4ba0c1b..bd4037a1 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -7,27 +7,27 @@ import java.io.UnsupportedEncodingException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Date;
+import java.sql.Date;
 import java.util.HashMap;
+import java.util.Map;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.DateSelector;
+import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.Page;
-import org.cacert.gigi.util.EmailChecker;
 import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.PasswordStrengthChecker;
 import org.cacert.gigi.util.RandomToken;
-import org.cacert.gigi.util.Sendmail;
 import org.cacert.gigi.util.ServerConstants;
 
-public class Signup {
+public class Signup extends Form {
 	User buildup = new User();
 	Template t;
 	boolean general = true, country = true, regional = true, radius = true;
@@ -47,7 +47,9 @@ public class Signup {
 	}
 	DateSelector myDoB = new DateSelector("day", "month", "year");
 
-	public void writeForm(PrintWriter out, Language l) {
+	@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()));
@@ -90,6 +92,7 @@ public class Signup {
 		myDoB.update(r);
 	}
 
+	@Override
 	public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
 		update(req);
 		boolean failed = false;
@@ -172,12 +175,13 @@ public class Signup {
 			e.printStackTrace();
 			failed = true;
 		}
-		String mailResult = EmailChecker.FAIL;
+		String mailResult = EmailProvider.FAIL;
 		try {
-			mailResult = EmailChecker.checkEmailServer(0, buildup.getEmail());
+			mailResult = EmailProvider.getInstance().checkEmailServer(0,
+					buildup.getEmail());
 		} catch (IOException e) {
 		}
-		if (!mailResult.equals(EmailChecker.OK)) {
+		if (!mailResult.equals(EmailProvider.OK)) {
 			if (mailResult.startsWith("4")) {
 				outputError(
 						out,
@@ -193,7 +197,7 @@ public class Signup {
 								+ " couldn't be made to your server, or the server"
 								+ " rejected the email address as invalid");
 			}
-			if (mailResult.equals(EmailChecker.FAIL)) {
+			if (mailResult.equals(EmailProvider.FAIL)) {
 				outputError(out, req,
 						"Failed to make a connection to the mail server");
 			} else {
@@ -215,62 +219,64 @@ public class Signup {
 		}
 		return true;
 	}
-	private void outputError(PrintWriter out, ServletRequest req, String text) {
-		out.print("<div>");
-		out.print(Page.translate(req, text));
-		out.println("</div>");
-	}
 
 	private void run(HttpServletRequest req, String password)
 			throws SQLException {
-		String hash = RandomToken.generateToken(16);
+		try {
+			DatabaseConnection.getInstance().beginTransaction();
+			String hash = RandomToken.generateToken(16);
 
-		buildup.insert(password);
-		int memid = buildup.getId();
-		PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-				"insert into `email` set `email`=?,"
-						+ " `hash`=?, `created`=NOW(),`memid`=?");
-		ps.setString(1, buildup.getEmail());
-		ps.setString(2, hash);
-		ps.setInt(3, memid);
-		ps.execute();
-		int emailid = DatabaseConnection.lastInsertId(ps);
-		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.execute();
-		Notary.writeUserAgreement(memid, "CCA", "account creation", "", true, 0);
+			buildup.setDob(myDoB.getDate());
+			buildup.insert(password);
+			int memid = buildup.getId();
+			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+					"insert into `email` set `email`=?,"
+							+ " `hash`=?, `created`=NOW(),`memid`=?");
+			ps.setString(1, buildup.getEmail());
+			ps.setString(2, hash);
+			ps.setInt(3, memid);
+			ps.execute();
+			int emailid = DatabaseConnection.lastInsertId(ps);
+			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.execute();
+			Notary.writeUserAgreement(memid, "CCA", "account creation", "",
+					true, 0);
 
-		StringBuffer body = new StringBuffer();
-		body.append(Page
-				.translate(
-						req,
-						"Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"));
-		body.append("\n\n");
-		body.append("http://");
-		body.append(ServerConstants.NORMAL_HOST_NAME);
-		body.append("/verify.php?type=email&emailid=");
-		body.append(emailid);
-		body.append("&hash=");
-		body.append(hash);
-		body.append("\n\n");
-		body.append(Page.translate(req, "Best regards"));
-		body.append("\n");
-		body.append(Page.translate(req, "CAcert.org Support!"));
-		try {
-			Sendmail.sendmail(buildup.getEmail(),
-					"[CAcert.org] " + Page.translate(req, "Mail Probe"),
-					body.toString(), "support@cacert.org", null, null, null,
-					null, false);
-		} catch (IOException e) {
-			e.printStackTrace();
+			StringBuffer body = new StringBuffer();
+			body.append(Page
+					.translate(
+							req,
+							"Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"));
+			body.append("\n\nhttps://");
+			body.append(ServerConstants.getWwwHostNamePort());
+			body.append("/verify?type=email&id=");
+			body.append(emailid);
+			body.append("&hash=");
+			body.append(hash);
+			body.append("\n\n");
+			body.append(Page.translate(req, "Best regards"));
+			body.append("\n");
+			body.append(Page.translate(req, "CAcert.org Support!"));
+			try {
+				EmailProvider.getInstance().sendmail(buildup.getEmail(),
+						"[CAcert.org] " + Page.translate(req, "Mail Probe"),
+						body.toString(), "support@cacert.org", null, null,
+						null, null, false);
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			DatabaseConnection.getInstance().commitTransaction();
+		} finally {
+			DatabaseConnection.getInstance().quitTransaction();
 		}
 
 	}