X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FAssuranceForm.java;h=7a49ee1b710dd321619d7a00fee54c9833135a1b;hb=45b1bef0919f9115f74b5b232e8fda4c787ba03d;hp=9bb87af512d49165c6c6105c393a403282e24971;hpb=086118bb498331de19b4d8d55caa59e0efd41402;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 9bb87af5..7a49ee1b 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -23,18 +23,18 @@ public class AssuranceForm extends Form {
 	User assuree;
 	static final Template templ;
 	static {
-		templ = new Template(new InputStreamReader(
-				AssuranceForm.class.getResourceAsStream("AssuranceForm.templ")));
+		templ = new Template(new InputStreamReader(AssuranceForm.class.getResourceAsStream("AssuranceForm.templ")));
 	}
 
-	public AssuranceForm(int assuree) {
+	public AssuranceForm(HttpServletRequest hsr, int assuree) {
+		super(hsr);
 		this.assuree = new User(assuree);
 	}
+
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
 	@Override
-	public void outputContent(PrintWriter out, Language l,
-			Map<String, Object> vars) {
+	public void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
 		HashMap<String, Object> res = new HashMap<String, Object>();
 		res.putAll(vars);
 		res.put("name", assuree.getName());
@@ -54,43 +54,34 @@ public class AssuranceForm extends Form {
 		out.println("<div class='formError'>");
 		boolean failed = false;
 
-		if (!"1".equals(req.getParameter("certify"))
-				|| !"1".equals(req.getParameter("rules"))
-				|| !"1".equals(req.getParameter("CCAAgreed"))
-				|| !"1".equals(req.getParameter("assertion"))) {
+		if (!"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules"))
+			|| !"1".equals(req.getParameter("CCAAgreed")) || !"1".equals(req.getParameter("assertion"))) {
 			outputError(out, req, "You failed to check all boxes to validate"
-					+ " your adherence to the rules and policies of CAcert");
+				+ " your adherence to the rules and policies of CAcert");
 			failed = true;
 
 		}
-		if (req.getParameter("date") == null
-				|| req.getParameter("date").equals("")) {
-			outputError(out, req,
-					"You must enter the date when you met the assuree.");
+		if (req.getParameter("date") == null || req.getParameter("date").equals("")) {
+			outputError(out, req, "You must enter the date when you met the assuree.");
 			failed = true;
 		} else {
 			try {
 				Date d = sdf.parse(req.getParameter("date"));
 				if (d.getTime() > System.currentTimeMillis()) {
-					outputError(out, req,
-							"You must not enter a date in the future.");
+					outputError(out, req, "You must not enter a date in the future.");
 					failed = true;
 				}
 			} catch (ParseException e) {
-				outputError(out, req,
-						"You must enter the date in this format: YYYY-MM-DD.");
+				outputError(out, req, "You must enter the date in this format: YYYY-MM-DD.");
 				failed = true;
 			}
 		}
 		// check location, min 3 characters
-		if (req.getParameter("location") == null
-				|| req.getParameter("location").equals("")) {
-			outputError(out, req,
-					"You failed to enter a location of your meeting.");
+		if (req.getParameter("location") == null || req.getParameter("location").equals("")) {
+			outputError(out, req, "You failed to enter a location of your meeting.");
 			failed = true;
 		} else if (req.getParameter("location").length() <= 2) {
-			outputError(out, req,
-					"You must enter a location with at least 3 characters eg town and country.");
+			outputError(out, req, "You must enter a location with at least 3 characters eg town and country.");
 			failed = true;
 		}
 		// TODO checkPoints
@@ -104,9 +95,8 @@ public class AssuranceForm extends Form {
 			return false;
 		}
 		try {
-			AssuranceResult success = Notary.assure(LoginPage.getUser(req),
-					assuree, Integer.parseInt(req.getParameter("points")),
-					req.getParameter("location"), req.getParameter("date"));
+			AssuranceResult success = Notary.assure(LoginPage.getUser(req), assuree,
+				Integer.parseInt(req.getParameter("points")), req.getParameter("location"), req.getParameter("date"));
 			if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
 				outputError(out, req, success.getMessage());
 			}