Fix menu exploding (so that we don't need the id's anymore)

[gigi.git] / src / org / cacert / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 0fead124456ddb1e2131eb2fb20bec33b6b509bc..74bfd623218a8bb9ea0bd0e684bbf25d70674d7a 100644 (file)
--- 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,8 +18,8 @@ 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;
@@ -38,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";
@@ -46,32 +49,70 @@ public class Gigi extends HttpServlet {
 
     private Template baseTemplate;
 
+    private LinkedList<Menu> categories = new LinkedList<Menu>();
+
     private HashMap<String, Page> pages = new HashMap<String, Page>();
 
-    private Menu m;
+    private HashMap<Page, String> reveresePages = new HashMap<Page, String>();
+
+    private Menu rootMenu;
+
+    private static Gigi instance;
 
     public Gigi(Properties conf) {
+        if (instance != null) {
+            new IllegalStateException("Multiple Gigi instances!");
+        }
+        instance = this;
         DatabaseConnection.init(conf);
     }
 
     @Override
     public void init() throws ServletException {
-        pages.put("/error", new PageNotFound());
-        pages.put("/login", new LoginPage("CACert - Login"));
-        pages.put("/", new MainPage("CACert - Home"));
-        pages.put("/secure", new TestSecure());
-        pages.put(Verify.PATH, new Verify());
-        pages.put(AssurePage.PATH + "/*", new AssurePage());
-        pages.put(Certificates.PATH + "/*", new Certificates());
-        pages.put(MyDetails.PATH, new MyDetails());
-        pages.put(ChangePasswordPage.PATH, new ChangePasswordPage());
-        pages.put(RegisterPage.PATH, new RegisterPage());
-        pages.put(CertificateAdd.PATH, new CertificateAdd());
-        pages.put(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"));
-        pages.put(DomainOverview.PATH, new DomainOverview("Domains"));
-        baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
-        m = new Menu("Certificates", "cert", new MenuItem(MailOverview.DEFAULT_PATH, "Emails"), new MenuItem("", "Client Certificates"), new MenuItem("", "Domains"), new MenuItem("", "Server Certificates"));
+        if ( !firstInstanceInited) {
+            putPage("/error", new PageNotFound(), null);
+            putPage("/login", new LoginPage("CACert - Login"), "Join CAcert.org");
+            putPage("/", new MainPage("CACert - Home"), null);
+            putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
+            putPage("/secure", new TestSecure(), null);
+            putPage(Verify.PATH, new Verify(), null);
+            putPage(AssurePage.PATH + "/*", new AssurePage(), "CAcert Web of Trust");
+            putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
+            putPage(MyDetails.PATH, new MyDetails(), "My Account");
+            putPage(RegisterPage.PATH, new RegisterPage(), "Join CAcert.org");
+            putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
+            putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates");
+            putPage(DomainOverview.PATH, new DomainOverview("Domains"), "Certificates");
+            baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
+            rootMenu = new Menu("Main");
+            for (Menu menu : categories) {
+                menu.prepare();
+                rootMenu.addItem(menu);
+            }
+            rootMenu.prepare();
+            firstInstanceInited = true;
+        }
         super.init();
+    }
+
+    private void putPage(String path, Page p, String category) {
+        pages.put(path, p);
+        reveresePages.put(p, path);
+        if (category == null) {
+            return;
+        }
+        Menu m = null;
+        for (Menu menu : categories) {
+            if (menu.getMenuName().equals(category)) {
+                m = menu;
+                break;
+            }
+        }
+        if (m == null) {
+            m = new Menu(category);
+            categories.add(m);
+        }
+        m.addItem(new PageMenuItem(p));
 
     }
 
@@ -95,7 +136,8 @@ public class Gigi extends HttpServlet {
         final Page p = getPage(req.getPathInfo());
         if (p != null) {
 
-            if ( !p.isPermitted(LoginPage.getUser(req)) && hs.getAttribute("loggedin") == null) {
+            User currentPageUser = LoginPage.getUser(req);
+            if ( !p.isPermitted(currentPageUser) && hs.getAttribute("loggedin") == null) {
                 String request = req.getPathInfo();
                 request = request.split("\\?")[0];
                 hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request);
@@ -133,7 +175,8 @@ public class Gigi extends HttpServlet {
 
                 }
             };
-            vars.put("menu", m);
+            vars.put(Menu.USER_VALUE, currentPageUser);
+            vars.put("menu", rootMenu);
             vars.put("title", p.getTitle());
             vars.put("static", ServerConstants.getStaticHostNamePort());
             vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
@@ -194,4 +237,9 @@ public class Gigi extends HttpServlet {
         }
         return defaultCSP;
     }
+
+    public static String getPathByPage(Page p) {
+        return instance.reveresePages.get(p).replaceFirst("/?\\*$", "");
+    }
+
 }