ADD: Get revocation date and display at cert overview

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index f7bc548fb2e2591f38caf3703893edf469ad4653..85ba0346e82e5b3494308b5fdd9f51ff0d4bc14d 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -407,4 +407,17 @@ public class Certificate {
         }
         return res;
     }
+
+    public java.util.Date getRevocationDate() {
+        if (getStatus() == CertificateStatus.REVOKED) {
+            GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT revoked FROM certs WHERE id=?");
+            prep.setInt(1, getId());
+            GigiResultSet res = prep.executeQuery();
+            res.beforeFirst();
+            if (res.next()) {
+                return new java.util.Date(res.getDate("revoked").getTime());
+            }
+        }
+        return null;
+    }
 }

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 14a62130d0ce64b2a998ace84b0741823c065abb..4dda163c9091893cba7b4ce4fbe75c353ee746bb 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -42,12 +42,16 @@ public class CertificateIterable implements IterableDataset {
                 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()));
+            } else {
+                vars.put("revoked", "n/a");
+            }
         } catch (IOException e) {
             e.printStackTrace();
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
-        vars.put("revoked", "TODO");// TODO output date
         return true;
     }
 }