add: add boolean to separate groups for user and support

[gigi.git] / src / org / cacert / gigi / output / ClientCSRGenerate.java

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index 20d1c68f04d985c4983d1075190ec1056bc18d7a..49be42590b1adf35d8257bc54d81776f56264a16 100644 (file)
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -12,20 +12,14 @@ import org.cacert.gigi.util.ServerConstants;
 
 public class ClientCSRGenerate {
 
-    private static Template normal;
-
-    private static Template IE;
-    static {
-        normal = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerate.templ"));
-        IE = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerateIE.templ"));
-    }
+    private static final Template normal = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerate.templ"));
 
     public static void output(HttpServletRequest req, HttpServletResponse resp) {
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("minsize", "2048");
-        vars.put("normalhost", "https://" + ServerConstants.getWwwHostNamePort());
+        vars.put("normalhost", "https://" + ServerConstants.getWwwHostNamePortSecure());
         vars.put("securehost", "https://" + ServerConstants.getSecureHostNamePort());
-        vars.put("statichost", "https://" + ServerConstants.getStaticHostNamePort());
+        vars.put("statichost", "https://" + ServerConstants.getStaticHostNamePortSecure());
         try {
             normal.output(resp.getWriter(), Page.getLanguage(req), vars);
         } catch (IOException e) {