X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=3f3cb95496c95477021dfff51a0d6fe36b878132;hb=1ecbdec666838439ce8ce68115da3a6dea41223b;hp=0fead124456ddb1e2131eb2fb20bec33b6b509bc;hpb=d895448cb685adc4c2bfac8d92759252d2ce8c36;p=gigi.git
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 0fead124..3f3cb954 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.Calendar;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
@@ -17,12 +18,13 @@ import org.cacert.gigi.database.DatabaseConnection;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.Form.CSRFException;
import org.cacert.gigi.output.Menu;
-import org.cacert.gigi.output.MenuItem;
import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.output.PageMenuItem;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
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 +36,13 @@ 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.util.ServerConstants;
public class Gigi extends HttpServlet {
+ private boolean firstInstanceInited = false;
+
public static final String LOGGEDIN = "loggedin";
public static final String USER = "user";
@@ -46,32 +51,72 @@ public class Gigi extends HttpServlet {
private Template baseTemplate;
+ private LinkedList