X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=632757d7691a95c7530e11fa80dc61912d79f195;hb=7c25e3d3b44f27fb3f7016432187d3a52db8083b;hp=b8f216de0c784d9a015405558a7659d0d1236770;hpb=9f58a3c856ee774a0e6a157a63298926b553523f;p=gigi.git
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index b8f216de..632757d7 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -2,8 +2,10 @@ package org.cacert.gigi;
import java.io.IOException;
import java.io.PrintWriter;
+import java.security.KeyStore;
import java.util.Calendar;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
@@ -18,11 +20,13 @@ import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.Form.CSRFException;
import org.cacert.gigi.output.Menu;
import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.SimpleMenuItem;
+import org.cacert.gigi.output.PageMenuItem;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.LogoutPage;
import org.cacert.gigi.pages.MainPage;
import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.StaticPage;
import org.cacert.gigi.pages.TestSecure;
import org.cacert.gigi.pages.Verify;
import org.cacert.gigi.pages.account.CertificateAdd;
@@ -34,10 +38,14 @@ import org.cacert.gigi.pages.account.MyDetails;
import org.cacert.gigi.pages.error.PageNotFound;
import org.cacert.gigi.pages.main.RegisterPage;
import org.cacert.gigi.pages.wot.AssurePage;
+import org.cacert.gigi.pages.wot.MyPoints;
+import org.cacert.gigi.ping.PingerDaemon;
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 USER = "user";
@@ -46,67 +54,116 @@ public class Gigi extends HttpServlet {
private Template baseTemplate;
+ private LinkedList