FIX: Cleanup fields

[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 54e1ebfe68b8e48f7631e14354623bd7dc7d90dd..0fead124456ddb1e2131eb2fb20bec33b6b509bc 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -14,7 +14,7 @@ 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;
@@ -25,10 +25,10 @@ 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.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.MailCertificateAdd;
-import org.cacert.gigi.pages.account.MailCertificates;
 import org.cacert.gigi.pages.account.MailOverview;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.error.PageNotFound;
@@ -48,10 +48,9 @@ public class Gigi extends HttpServlet {
 
     private HashMap<String, Page> pages = new HashMap<String, Page>();
 
-    Menu m;
+    private Menu m;
 
     public Gigi(Properties conf) {
-        EmailProvider.init(conf);
         DatabaseConnection.init(conf);
     }
 
@@ -63,11 +62,11 @@ public class Gigi extends HttpServlet {
         pages.put("/secure", new TestSecure());
         pages.put(Verify.PATH, new Verify());
         pages.put(AssurePage.PATH + "/*", new AssurePage());
-        pages.put(MailCertificates.PATH + "/*", new MailCertificates());
+        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(MailCertificateAdd.PATH, new MailCertificateAdd());
+        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"));
@@ -96,7 +95,7 @@ public class Gigi extends HttpServlet {
         final Page p = getPage(req.getPathInfo());
         if (p != null) {
 
-            if (p.needsLogin() && hs.getAttribute("loggedin") == null) {
+            if ( !p.isPermitted(LoginPage.getUser(req)) && hs.getAttribute("loggedin") == null) {
                 String request = req.getPathInfo();
                 request = request.split("\\?")[0];
                 hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request);