X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FClientCSRGenerate.java;h=49be42590b1adf35d8257bc54d81776f56264a16;hb=6fb0df7aaddac7a9b4d446d40832e771a0290f86;hp=aeb7d9b81cf5b6f30a32830b59e9500011d1f95c;hpb=6a986f7d7dd2de2e39a8070b32b651132e0da23a;p=gigi.git

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index aeb7d9b8..49be4259 100644
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -1,39 +1,29 @@
 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 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.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();
+        }
+    }
 }