ADD: Param to include all certificates (also revoked ones)

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index b41a404ae35f525e5921a4e11c7e5aa34b2cc220..d7439f2ca0b60f8323b6395f6784f8b643288c37 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -91,8 +91,13 @@ public abstract class CertificateOwner implements IdCachable {
 
     }
 
 
     }
 

-    public Certificate[] getCertificates() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked IS NULL");
+    public Certificate[] getCertificates(boolean includeRevoked) {
+        GigiPreparedStatement ps;
+        if (includeRevoked) {
+            ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=?");
+        } else {
+            ps = DatabaseConnection.getInstance().prepare("SELECT serial FROM certs WHERE memid=? AND revoked IS NULL");
+        }

         ps.setInt(1, getId());
         GigiResultSet rs = ps.executeQuery();
         rs.last();
         ps.setInt(1, getId());
         GigiResultSet rs = ps.executeQuery();
         rs.last();

diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java
index 25a11b7a2fc897f36f75ffa9c53ce67a7c16bbff..407fcb5916c2c7fff3bf1605639b44333a6b3f04 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Organisation.java
+++ b/src/org/cacert/gigi/dbObjects/Organisation.java
@@ -153,7 +153,7 @@ public class Organisation extends CertificateOwner {
     }
 
     public void update(String o, String c, String st, String l) {
     }
 
     public void update(String o, String c, String st, String l) {

-        for (Certificate cert : getCertificates()) {
+        for (Certificate cert : getCertificates(false)) {

             if (cert.getStatus() == CertificateStatus.ISSUED) {
                 cert.revoke();
             }
             if (cert.getStatus() == CertificateStatus.ISSUED) {
                 cert.revoke();
             }

diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index ac2289f342de24c01a9b1cb9be899e15d0b07b07..e41a1b297914316ec12a591d8a8f4de52958fc56 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -110,7 +110,7 @@ public class Certificates extends Page {
 
         HashMap<String, Object> vars = new HashMap<String, Object>();
         User us = LoginPage.getUser(req);
 
         HashMap<String, Object> vars = new HashMap<String, Object>();
         User us = LoginPage.getUser(req);

-        vars.put("certs", new CertificateIterable(us.getCertificates()));
+        vars.put("certs", new CertificateIterable(us.getCertificates(false)));

         certTable.output(out, getLanguage(req), vars);
     }
 
         certTable.output(out, getLanguage(req), vars);
     }
 

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index dffbbded86475e683b28d64a1cfa9ceb8653e176..9fcb1868a1276a5d7382328fc5cbc930c950397f 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -115,7 +115,7 @@ public class TestUser extends ManagedTest {
         Assurance[] ma2 = u.getMadeAssurances();
         Assurance[] ra = u.getReceivedAssurances();
         Assurance[] ra2 = u.getReceivedAssurances();
         Assurance[] ma2 = u.getMadeAssurances();
         Assurance[] ra = u.getReceivedAssurances();
         Assurance[] ra2 = u.getReceivedAssurances();

-        assertEquals(0, u.getCertificates().length);
+        assertEquals(0, u.getCertificates(false).length);

         assertEquals(0, ma.length);
         assertEquals(0, ma2.length);
         assertEquals(0, ra.length);
         assertEquals(0, ma.length);
         assertEquals(0, ma2.length);
         assertEquals(0, ra.length);