Keep the selected certificate profile.

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index a5c738d22b7f00bb7f8b29d915b8f320c79109a1..decda34dfc074f417b8d84df63dd007e5816886e 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -84,6 +84,8 @@ public class CertificateIssueForm extends Form {
 
     boolean login;
 
+    CertificateProfile profile = CertificateProfile.getById(1);
+
     public CertificateIssueForm(HttpServletRequest hsr) {
         super(hsr);
         u = Page.getUser(hsr);
@@ -194,14 +196,12 @@ public class CertificateIssueForm extends Form {
                     if (hashAlg != null) {
                         selectedDigest = Digest.valueOf(hashAlg);
                     }
-                    CertificateProfile profile = CertificateProfile.getByName(req.getParameter("profile"));
+                    profile = CertificateProfile.getByName(req.getParameter("profile"));
 
                     String pDNS = null;
                     String pMail = null;
                     Set<SubjectAlternateName> filteredSANs = new LinkedHashSet<>();
                     boolean server = profile.getKeyName().equals("server");
-                    boolean dirty = false;
-                    ;
                     for (SubjectAlternateName san : parseSANBox(req.getParameter("SANs"))) {
                         if (san.getType() == SANType.DNS) {
                             if (u.isValidDomain(san.getName()) && server) {
@@ -220,7 +220,6 @@ public class CertificateIssueForm extends Form {
                                 continue;
                             }
                         }
-                        dirty = true;
                         outputError(out, req, "The requested Subject alternate name \"%s\" has been removed.",//
                                 san.getType().toString().toLowerCase() + ":" + san.getName());
                     }
@@ -373,6 +372,11 @@ public class CertificateIssueForm extends Form {
                 if (cp == null) {
                     return false;
                 }
+                if (cp.getId() == profile.getId()) {
+                    vars.put("selected", " selected");
+                } else {
+                    vars.put("selected", "");
+                }
                 vars.put("key", cp.getKeyName());
                 vars.put("name", cp.getVisibleName());
                 return true;

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
index d3cd81efbe84125042e61bd5a6f634a5f886ce65..6c76287cce89397519d1b15486a8adc242f97ffa 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
@@ -21,7 +21,7 @@
     <?=_Key type?>: 
     <select name="profile">
     <? foreach($profiles) { ?>
-      <option value="<?=$key?>"><?=$name?></option>
+      <option value="<?=$key?>"<?=$!selected?>><?=$name?></option>
     <? } ?>
     </select>
     </td>