X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificateProfile.java;h=0aa45512708391d41fa833f1c35e634de7bf1959;hb=eb4c79b0d286f812bda401a7dea64b19223d560c;hp=26634a664dcde4e71b62cf792223e215d5498e2f;hpb=3e123160ad59a2e1162518923965562ff947b6d1;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/CertificateProfile.java b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
index 26634a66..0aa45512 100644
--- a/src/org/cacert/gigi/dbObjects/CertificateProfile.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
@@ -14,14 +14,17 @@ public class CertificateProfile {
 
     private final String visibleName;
 
+    private final int caId;
+
     private static HashMap<String, CertificateProfile> byName = new HashMap<>();
 
     private static HashMap<Integer, CertificateProfile> byId = new HashMap<>();
 
-    private CertificateProfile(int id, String keyName, String visibleName) {
+    private CertificateProfile(int id, String keyName, String visibleName, int caId) {
         this.id = id;
         this.keyName = keyName;
         this.visibleName = visibleName;
+        this.caId = caId;
     }
 
     public int getId() {
@@ -36,11 +39,15 @@ public class CertificateProfile {
         return visibleName;
     }
 
+    public int getCAId() {
+        return caId;
+    }
+
     static {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id, keyname, name FROM `profiles`");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id, keyname, name, rootcert FROM `profiles`");
         GigiResultSet rs = ps.executeQuery();
         while (rs.next()) {
-            CertificateProfile cp = new CertificateProfile(rs.getInt("id"), rs.getString("keyName"), rs.getString("name"));
+            CertificateProfile cp = new CertificateProfile(rs.getInt("id"), rs.getString("keyName"), rs.getString("name"), rs.getInt("rootcert"));
             byId.put(cp.getId(), cp);
             byName.put(cp.getKeyName(), cp);
         }
@@ -55,4 +62,8 @@ public class CertificateProfile {
         return byName.get(name);
     }
 
+    public static CertificateProfile[] getAll() {
+        return byId.values().toArray(new CertificateProfile[byId.size()]);
+    }
+
 }