X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=74bfd623218a8bb9ea0bd0e684bbf25d70674d7a;hp=af0e222b031c42a6005abb99adc9b203f63a386c;hb=2fb0af2c1dd48272ffcc1d501324ff1f609331d4;hpb=480cb29387c76ccc19f8fa8fb0abe8ae1b069730
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index af0e222b..74bfd623 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;
@@ -14,22 +15,21 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.email.EmailProvider;
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.TestSecure;
import org.cacert.gigi.pages.Verify;
-import org.cacert.gigi.pages.account.ChangePasswordPage;
-import org.cacert.gigi.pages.account.DomainOverview;
import org.cacert.gigi.pages.account.CertificateAdd;
import org.cacert.gigi.pages.account.Certificates;
+import org.cacert.gigi.pages.account.ChangePasswordPage;
+import org.cacert.gigi.pages.account.DomainOverview;
import org.cacert.gigi.pages.account.MailOverview;
import org.cacert.gigi.pages.account.MyDetails;
import org.cacert.gigi.pages.error.PageNotFound;
@@ -39,6 +39,8 @@ 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";
@@ -47,33 +49,70 @@ public class Gigi extends HttpServlet {
private Template baseTemplate;
+ private LinkedList