X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FOrganisation.java;h=4c23488e88ace2c185d7a62a49654d836abbb3f4;hb=346185795ad8dd3dbfeb417d2dccb69a39af64be;hp=633412c440fff98732c4fdfc11a0e9bfe2505cfa;hpb=d4802b68c651a984f0b98a462ac1e7721aa50388;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java
index 633412c4..4c23488e 100644
--- a/src/org/cacert/gigi/dbObjects/Organisation.java
+++ b/src/org/cacert/gigi/dbObjects/Organisation.java
@@ -49,19 +49,23 @@ public class Organisation extends CertificateOwner {
 
     private String city;
 
-    public Organisation(String name, String state, String province, String city, User creator) {
+    private String email;
+
+    public Organisation(String name, String state, String province, String city, String email, User creator) {
         this.name = name;
         this.state = state;
         this.province = province;
         this.city = city;
+        this.email = email;
         int id = super.insert();
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, creator=?");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, creator=?");
         ps.setInt(1, id);
         ps.setString(2, name);
         ps.setString(3, state);
         ps.setString(4, province);
         ps.setString(5, city);
-        ps.setInt(6, creator.getId());
+        ps.setString(6, email);
+        ps.setInt(7, creator.getId());
         synchronized (Organisation.class) {
             ps.execute();
         }
@@ -74,6 +78,7 @@ public class Organisation extends CertificateOwner {
         state = rs.getString("state");
         province = rs.getString("province");
         city = rs.getString("city");
+        city = rs.getString("contactEmail");
     }
 
     public String getName() {
@@ -92,6 +97,10 @@ public class Organisation extends CertificateOwner {
         return city;
     }
 
+    public String getContactEmail() {
+        return email;
+    }
+
     public static synchronized Organisation getById(int id) {
         CertificateOwner co = CertificateOwner.getById(id);
         if (co instanceof Organisation) {
@@ -138,7 +147,7 @@ public class Organisation extends CertificateOwner {
     }
 
     public static Organisation[] getOrganisations(int offset, int count) {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM organisations LIMIT ?,?");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certOwners.id FROM organisations inner join certOwners on certOwners.id=organisations.id where certOwners.deleted is null LIMIT ?,?");
         ps.setInt(1, offset);
         ps.setInt(2, count);
         GigiResultSet res = ps.executeQuery();
@@ -153,7 +162,7 @@ public class Organisation extends CertificateOwner {
     }
 
     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();
             }