X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=6af640ead48ddf2b83a8a2905f8415ff46c6d85d;hb=6dcec2ace981aadba1f0a04e20e2bafe19b47976;hp=8c4a234c5a30a3f14ab9fa26eb12e7fd3745a573;hpb=98aa1434dc5e06971dcd35f6b9bd335216edce43;p=gigi.git
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 8c4a234c..6af640ea 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -2,9 +2,11 @@ package org.cacert.gigi;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.Calendar;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Locale;
@@ -60,53 +62,42 @@ import org.cacert.gigi.util.ServerConstants;
public class Gigi extends HttpServlet {
- private boolean firstInstanceInited = false;
-
- public static final String LOGGEDIN = "loggedin";
-
- public static final String CERT_SERIAL = "org.cacert.gigi.serial";
-
- public static final String CERT_ISSUER = "org.cacert.gigi.issuer";
-
- public static final String USER = "user";
-
- public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod";
-
- private static final long serialVersionUID = -6386785421902852904L;
-
- private Template baseTemplate;
+ private class MenuBuilder {
- private LinkedList