X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FClientCSRGenerate.java;h=440d2b0c3087dbb3d06f6f6d9b376e5297ab2b45;hb=17c03c2e6e0b88545a4ebeb377fff0953e446c93;hp=9398c2200d2e50efa51441ed97267c5fe435d83c;hpb=2824d1c165c501e2f3a8809044788b33b81f478a;p=gigi.git

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index 9398c220..440d2b0c 100644
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -1,35 +1,33 @@
 package org.cacert.gigi.output;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.ServerConstants;
 
 public class ClientCSRGenerate {
-	static Template normal;
-	static Template IE;
-	static {
-		normal = new Template(new InputStreamReader(
-			ClientCSRGenerate.class.getResourceAsStream("ClientCSRGenerate.templ")));
-		IE = new Template(new InputStreamReader(
-			ClientCSRGenerate.class.getResourceAsStream("ClientCSRGenerateIE.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("securehost", "https://" + ServerConstants.getSecureHostNamePort());
-		vars.put("statichost", "https://" + ServerConstants.getStaticHostNamePort());
-		try {
-			normal.output(resp.getWriter(), Page.getLanguage(req), vars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
+    private static Template normal;
+
+    static {
+        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.getWwwHostNamePortSecure());
+        vars.put("securehost", "https://" + ServerConstants.getSecureHostNamePort());
+        vars.put("statichost", "https://" + ServerConstants.getStaticHostNamePortSecure());
+        try {
+            normal.output(resp.getWriter(), Page.getLanguage(req), vars);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }