chg: Avoid dirtying the environment with Thread Interruption exceptions if nobody...

[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 a3e4b80fc91616b3460c811193899b234286bbe9..eecb31fe786a5e7373ee7445462af5e5446661c2 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
@@ -75,13 +75,11 @@ public class CertificateIssueForm extends Form {
 
                     try {
                         cr.update(req.getParameter("CN"), req.getParameter("hash_alg"), req.getParameter("profile"), //
-                                req.getParameter("org"), req.getParameter("OU"), req.getParameter("SANs"), out, req);
+                                req.getParameter("org"), req.getParameter("OU"), req.getParameter("SANs"));
                     } catch (GigiApiException e) {
                         error.mergeInto(e);
                     }
-                    if (req.getParameter("tos_agree") == null) {
-                        error.mergeInto(new GigiApiException("You need to accept the ToS."));
-                    }
+
                     Certificate result = null;
                     try {
                         result = cr.draft();
@@ -106,8 +104,6 @@ public class CertificateIssueForm extends Form {
             } catch (GeneralSecurityException e) {
                 e.printStackTrace();
                 throw new GigiApiException("Certificate Request format is invalid.");
-            } catch (InterruptedException e) {
-                e.printStackTrace();
             }
         } catch (GigiApiException e) {
             e.format(out, Page.getLanguage(req));
@@ -132,7 +128,6 @@ public class CertificateIssueForm extends Form {
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         HashMap<String, Object> vars2 = new HashMap<String, Object>(vars);
-        vars2.put("ToS", "<a href='/policy/TermsOfService.html'>ToS</a>");
 
         StringBuffer content = new StringBuffer();
         for (SubjectAlternateName SAN : cr.getSANs()) {