vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
X509Certificate cert = c.cert();
- vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore()));
- vars.put("expire", DateSelector.getDateFormat().format(cert.getNotAfter()));
+ vars.put("issued", cert.getNotBefore());
+ vars.put("expire", cert.getNotAfter());
} else {
vars.put("issued", l.getTranslation("N/A"));
vars.put("expire", l.getTranslation("N/A"));
}
if (st == CertificateStatus.REVOKED) {
- vars.put("revoked", DateSelector.getDateFormat().format(c.getRevocationDate()));
+ vars.put("revoked", c.getRevocationDate());
} else {
vars.put("revoked", "n/a");
}
import java.io.Reader;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Date;
import java.util.LinkedList;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.DateSelector;
import org.cacert.gigi.util.HTMLEncoder;
public class Template implements Outputable {
}
if (s instanceof Outputable) {
((Outputable) s).output(out, l, vars);
+ } else if (s instanceof Date) {
+ out.print(DateSelector.getDateFormat().format(s));
} else {
out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
}
vars.put("DoB", ds);
templ.output(out, l, vars);
} else {
- vars.put("DoB", DateSelector.getDateFormat().format(target.getDoB()));
+ vars.put("DoB", target.getDoB());
assured.output(out, l, vars);
}
}
import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.DateSelector;
import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
vars.put("name", u.getName());
vars.put("email", u.getEmail());
- vars.put("DoB", DateSelector.getDateFormat().format(u.getDoB()));
+ vars.put("DoB", u.getDoB());
vars.put("uid", Integer.toString(u.getId()));
t.output(out, l, vars);
}
import org.cacert.gigi.dbObjects.CertificateProfile;
import org.cacert.gigi.dbObjects.SupportedUser;
import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.DateSelector;
import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.IterableDataset;
import org.cacert.gigi.output.template.Template;
if (lastExpire == Long.MIN_VALUE) {
vars.put("lastdate", "-");
} else {
- vars.put("lastdate", DateSelector.getDateFormat().format(new Date(lastExpire)));
+ vars.put("lastdate", new Date(lastExpire));
}
typeIndex++;
return true;