Display Profiles while issuing certificates.

[gigi.git] / src / org / cacert / gigi / pages / account / CertificateIssueForm.java

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index 225f24deb82766bc45ef7d9b0162d7f4e9ab7dca..aee6cddf2f6bc61920e45abb65d3b65d529e1789 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Certificate;
 import org.cacert.gigi.Certificate.CSRType;
+import org.cacert.gigi.CertificateProfile;
 import org.cacert.gigi.Digest;
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
@@ -116,7 +117,7 @@ public class CertificateIssueForm extends Form {
                         return false;
                     }
                     System.out.println("issuing " + selectedDigest);
-                    result = new Certificate(LoginPage.getUser(req).getId(), "/commonName=CAcert WoT User", selectedDigest.toString(), this.csr, this.csrType);
+                    result = new Certificate(LoginPage.getUser(req).getId(), "/commonName=CAcert WoT User", selectedDigest.toString(), this.csr, this.csrType, CertificateProfile.getById(1));
                     result.issue().waitFor(60000);
                     return true;
                 }
@@ -200,6 +201,21 @@ public class CertificateIssueForm extends Form {
             }
         });
         vars2.put("hashs", new HashAlgorithms(selectedDigest));
+        vars2.put("profiles", new IterableDataset() {
+
+            int i = 1;
+
+            @Override
+            public boolean next(Language l, Map<String, Object> vars) {
+                CertificateProfile cp = CertificateProfile.getById(i++);
+                if (cp == null) {
+                    return false;
+                }
+                vars.put("key", cp.getKeyName());
+                vars.put("name", cp.getVisibleName());
+                return true;
+            }
+        });
         t.output(out, l, vars2);
     }
 }