add: make inclusion of leaf certificate optional

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

diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index 45ca5637ceb0f018d582663fced91abd6a2077a6..4db201cc38fcf4b1be4381283514a84b977dcd1c 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -81,8 +81,9 @@ public class Certificates extends Page implements HandlesMixedRequest {
             ServletOutputStream out = resp.getOutputStream();
             boolean doChain = req.getParameter("chain") != null;
             boolean includeAnchor = req.getParameter("noAnchor") == null;
+            boolean includeLeaf = req.getParameter("noLeaf") == null;
             if (crt) {
-                CertExporter.writeCertCrt(c, out, doChain, includeAnchor);
+                CertExporter.writeCertCrt(c, out, doChain, includeAnchor, includeLeaf);
             } else if (cer) {
                 CertExporter.writeCertCer(c, out, doChain, includeAnchor);
             }
@@ -208,11 +209,7 @@ public class Certificates extends Page implements HandlesMixedRequest {
                         return true;
                     }
                 });
-                if (c.isLoginEnabled()) {
-                    vars.put("login", l.getTranslation("Yes"));
-                } else {
-                    vars.put("login", l.getTranslation("No"));
-                }
+                vars.put("login", c.isLoginEnabled());
             } catch (GeneralSecurityException e) {
                 e.printStackTrace();
             }