X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fmain%2FCertStatusRequestForm.java;h=5d23f67f26b8b59af5987af6713dd7d548e7f778;hb=3889444cb95132e342e4b7156245dd032ed3b16b;hp=88e1264b7ed34cb2e0107e4726dc2f2d60abc6bc;hpb=e010e578f0e53056972097049110fcab0e11fd34;p=gigi.git

diff --git a/src/club/wpia/gigi/pages/main/CertStatusRequestForm.java b/src/club/wpia/gigi/pages/main/CertStatusRequestForm.java
index 88e1264b..5d23f67f 100644
--- a/src/club/wpia/gigi/pages/main/CertStatusRequestForm.java
+++ b/src/club/wpia/gigi/pages/main/CertStatusRequestForm.java
@@ -1,6 +1,7 @@
 package club.wpia.gigi.pages.main;
 
 import java.io.PrintWriter;
+import java.util.Date;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -46,9 +47,12 @@ public class CertStatusRequestForm extends Form {
         }
 
         if (c.getStatus() == CertificateStatus.REVOKED) {
-            java.util.Date revocationDate = c.getRevocationDate();
+            Date revocationDate = c.getRevocationDate();
             throw new PermamentFormException(new GigiApiException(SprintfCommand.createSimple("Certificate has been revoked on {0}.", revocationDate)));
         }
+        if (c.getExpiryDate().before(new Date())) {
+            return new SuccessMessageResult((SprintfCommand.createSimple("Certificate is valid but has expired on {0}.", c.getExpiryDate())));
+        }
 
         return new SuccessMessageResult(new TranslateCommand("Certificate is valid."));
     }