X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Foutput%2FCertificateIterable.java;h=4ff458e9c8c993e410c2e6c0769a50abf705d711;hb=883d4975772ff13be7cb7ab7743dcb52b9ee709c;hp=cb4b35235d7d0dad931f5a9d74e327f5d515e132;hpb=a507c4de2568faaf53bb8d6e003ffbe1ced5d539;p=gigi.git diff --git a/src/club/wpia/gigi/output/CertificateIterable.java b/src/club/wpia/gigi/output/CertificateIterable.java index cb4b3523..4ff458e9 100644 --- a/src/club/wpia/gigi/output/CertificateIterable.java +++ b/src/club/wpia/gigi/output/CertificateIterable.java @@ -36,6 +36,7 @@ public class CertificateIterable implements IterableDataset { vars.put("serial", c.getSerial()); vars.put("digest", c.getMessageDigest()); vars.put("profile", c.getProfile().getVisibleName()); + vars.put("description", c.getDescription()); CertificateStatus st = c.getStatus(); vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED); String issuedWarning = ""; @@ -45,6 +46,13 @@ public class CertificateIterable implements IterableDataset { vars.put("classIssued", ""); vars.put("classExpired", ""); vars.put("revoked", l.getTranslation("N/A")); + vars.put("actorinitials", l.getTranslation("N/A")); + vars.put("actorname", l.getTranslation("N/A")); + + if (c.getActor() != null) { + vars.put("actorinitials", c.getActor().getInitials()); + vars.put("actorname", c.getActor().getPreferredName().toString() + " <" + c.getActor().getEmail() + ">"); + } try { if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {