import java.io.PrintWriter;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.pages.PasswordResetPage;
+import org.cacert.gigi.util.DayDate;
import org.cacert.gigi.util.Notary;
import org.cacert.gigi.util.RandomToken;
import org.cacert.gigi.util.ServerConstants;
private Name assureeName;
- private Date dob;
+ private DayDate dob;
private String location = "";
res.put("nameExplicit", assuree.getName());
res.put("name", assuree.getName().toString());
res.put("maxpoints", assurer.getMaxAssurePoints());
- res.put("dob", sdf.format(assuree.getDoB()));
- res.put("dobFmt2", sdf2.format(assuree.getDoB()));
+ res.put("dob", sdf.format(assuree.getDoB().toDate()));
+ res.put("dobFmt2", sdf2.format(assuree.getDoB().toDate()));
res.put("location", location);
res.put("date", date);
res.put("aword", aword);
outputError(out, req, "You need to enter location and date!");
}
- 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("tos_agree")) || !"1".equals(req.getParameter("assertion"))) {
outputError(out, req, "You failed to check all boxes to validate" + " your adherence to the rules and policies of SomeCA");
-
}
if ("1".equals(req.getParameter("passwordReset"))) {
aword = req.getParameter("passwordResetValue");
Language l = Language.getInstance(assuree.getPreferredLocale());
StringBuffer body = new StringBuffer();
body.append(l.getTranslation("Hi,") + "\n\n");
- body.append(l.getTranslation("A password reset was triggered. If you did a password reset by assurance, please enter your secret password using this form: \nhttps://"));
+ body.append(l.getTranslation("A password reset was triggered. If you did a password reset by assurance, please enter your secret password using this form:"));
+ body.append("\n\nhttps://");
body.append(ServerConstants.getWwwHostNamePortSecure() + PasswordResetPage.PATH);
body.append("?id=");
body.append(id);