X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=d153758ee31037dfaaf3d5b5794f01b13d27e50c;hb=f0b9b09f6cc96110ec0974d085bd05bef403a9c6;hp=e426a6d473ccae82888a04af845750c870668acf;hpb=b70d7d710cea55608c132d3768c25ee7bed16bd0;p=gigi.git
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index e426a6d4..d153758e 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -6,6 +6,7 @@ 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;
@@ -29,6 +30,7 @@ import org.cacert.gigi.output.SimpleMenuItem;
import org.cacert.gigi.output.template.Form.CSRFException;
import org.cacert.gigi.output.template.Outputable;
import org.cacert.gigi.output.template.Template;
+import org.cacert.gigi.pages.HandlesMixedRequest;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.LogoutPage;
import org.cacert.gigi.pages.MainPage;
@@ -61,53 +63,42 @@ import org.cacert.gigi.util.ServerConstants;
public class Gigi extends HttpServlet {
- private boolean firstInstanceInited = false;
-
- public static final String LOGGEDIN = "loggedin";
+ private class MenuBuilder {
- public static final String CERT_SERIAL = "org.cacert.gigi.serial";
+ private LinkedList