X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportRevokeCertificatesForm.java;h=32f52254247f16711615c6ccd1d5ba5c2536ebaf;hb=f0b9b09f6cc96110ec0974d085bd05bef403a9c6;hp=e4bedb34e819f7686a63fe53e72f884c8cd3df86;hpb=8efbd22b42900f0184bd7265af9feb38fc0a4e08;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
index e4bedb34..32f52254 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.SupportedUser;
 import org.cacert.gigi.localisation.Language;
@@ -55,6 +56,7 @@ public class SupportRevokeCertificatesForm extends Form {
                 }
                 int valid = 0;
                 int total = 0;
+                int revoked = 0;
                 long lastExpire = Long.MIN_VALUE;
                 for (int i = 0; i < certs.length; i++) {
                     try {
@@ -62,6 +64,13 @@ public class SupportRevokeCertificatesForm extends Form {
                             continue;
                         }
                         total++;
+                        if (certs[i].getStatus() == CertificateStatus.DRAFT) {
+                            continue;
+                        }
+                        if (certs[i].getStatus() == CertificateStatus.REVOKED) {
+                            revoked++;
+                            continue;
+                        }
                         certs[i].cert().checkValidity();
                         lastExpire = Math.max(lastExpire, certs[i].cert().getNotAfter().getTime());
                         valid++;
@@ -73,7 +82,7 @@ public class SupportRevokeCertificatesForm extends Form {
                 vars.put("profile", profiles[typeIndex].getVisibleName());
                 vars.put("valid", valid);
                 vars.put("exp", total - valid);
-                vars.put("rev", "TODO");
+                vars.put("rev", revoked);
                 if (lastExpire == Long.MIN_VALUE) {
                     vars.put("lastdate", "-");
                 } else {