upd: convert to PostgreSQL

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

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
index 6f099195ee1b780c1771ca02a4a283325350daee..5ac13fda21fb00188b36e3dbe823fc1455aaa97f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
@@ -83,16 +83,18 @@ public class CertificateIssueForm extends Form {
                     if (req.getParameter("CCA") == null) {
                         error.mergeInto(new GigiApiException("You need to accept the CCA."));
                     }
+                    Certificate result = null;
                     try {
                         result = cr.draft();
                     } catch (GigiApiException e) {
                         error.mergeInto(e);
                     }
-                    if ( !error.isEmpty()) {
+                    if ( !error.isEmpty() || result == null) {
                         error.format(out, Page.getLanguage(req));
                         return false;
                     }
                     result.issue(issueDate.getFrom(), issueDate.getTo()).waitFor(60000);
+                    this.result = result;
                     return true;
                 } else {
                     throw new GigiApiException("Error no action.");
@@ -141,7 +143,7 @@ public class CertificateIssueForm extends Form {
             content.append('\n');
         }
 
-        vars2.put("CN", cr.getCN());
+        vars2.put("CN", cr.getName());
         vars2.put("department", cr.getOu());
         vars2.put("validity", issueDate);
         vars2.put("emails", content.toString());
@@ -158,7 +160,7 @@ public class CertificateIssueForm extends Form {
                     if (cp == null) {
                         return false;
                     }
-                } while ( !u.canIssue(cp));
+                } while ( !cp.canBeIssuedBy(u));
 
                 if (cp.getId() == cr.getProfile().getId()) {
                     vars.put("selected", " selected");