X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=1108aa04bf26ff2fd40b30b70fc05caba37b2cd8;hp=ab0e1b6fa7e2acefa4f15feea664d18648b183cc;hb=a4a022f3ef3f697298fca60520d422d8662ec706;hpb=85b9c7cfd0426eca278b609b96dd6b17b0a5144f

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index ab0e1b6f..1108aa04 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -31,6 +31,7 @@ import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.MenuCollector;
 import org.cacert.gigi.output.PageMenuItem;
 import org.cacert.gigi.output.SimpleMenuItem;
+import org.cacert.gigi.output.SimpleUntranslatedMenuItem;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Form.CSRFException;
 import org.cacert.gigi.output.template.Outputable;
@@ -57,8 +58,8 @@ import org.cacert.gigi.pages.account.certs.Certificates;
 import org.cacert.gigi.pages.account.domain.DomainOverview;
 import org.cacert.gigi.pages.account.mail.MailOverview;
 import org.cacert.gigi.pages.admin.TTPAdminPage;
-import org.cacert.gigi.pages.admin.support.FindDomainPage;
-import org.cacert.gigi.pages.admin.support.FindUserPage;
+import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
+import org.cacert.gigi.pages.admin.support.FindUserByEmailPage;
 import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
 import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
 import org.cacert.gigi.pages.error.AccessDenied;
@@ -67,12 +68,14 @@ import org.cacert.gigi.pages.main.RegisterPage;
 import org.cacert.gigi.pages.orga.CreateOrgPage;
 import org.cacert.gigi.pages.orga.ViewOrgPage;
 import org.cacert.gigi.pages.wot.AssurePage;
-import org.cacert.gigi.pages.wot.MyPoints;
+import org.cacert.gigi.pages.wot.Points;
 import org.cacert.gigi.pages.wot.RequestTTPPage;
 import org.cacert.gigi.ping.PingerDaemon;
 import org.cacert.gigi.util.AuthorizationContext;
 import org.cacert.gigi.util.DomainAssessment;
+import org.cacert.gigi.util.PasswordHash;
 import org.cacert.gigi.util.ServerConstants;
+import org.cacert.gigi.util.TimeConditions;
 
 public final class Gigi extends HttpServlet {
 
@@ -142,7 +145,7 @@ public final class Gigi extends HttpServlet {
             putPage(DomainOverview.PATH + "*", new DomainOverview(), "Certificates");
 
             putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
-            putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");
+            putPage(Points.PATH, new Points(false), "Web of Trust");
             putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
 
             putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
@@ -150,12 +153,11 @@ public final class Gigi extends HttpServlet {
             putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
 
             putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
-            putPage(FindUserPage.PATH, new FindUserPage(), "Support Console");
-            putPage(FindDomainPage.PATH, new FindDomainPage(), "Support Console");
+            putPage(FindUserByEmailPage.PATH, new FindUserByEmailPage(), "Support Console");
+            putPage(FindUserByDomainPage.PATH, new FindUserByDomainPage(), "Support Console");
 
             putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null);
             putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
-            putPage(LogoutPage.PATH, new LogoutPage(), "My Account");
             putPage(History.PATH, new History(false), "My Account");
             putPage(FindAgentAccess.PATH, new OneFormPage("Access to Find Agent", FindAgentAccess.class) {
 
@@ -168,8 +170,10 @@ public final class Gigi extends HttpServlet {
             putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");
             putPage(MyDetails.PATH, new MyDetails(), "My Account");
             putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null);
+            putPage(Points.SUPPORT_PATH, new Points(true), null);
 
             putPage(PasswordResetPage.PATH, new PasswordResetPage(), null);
+            putPage(LogoutPage.PATH, new LogoutPage(), null);
 
             if (testing) {
                 try {
@@ -187,13 +191,10 @@ public final class Gigi extends HttpServlet {
             } catch (UnsupportedEncodingException e) {
                 throw new ServletException(e);
             }
-            baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
             rootMenu = new MenuCollector();
 
             Menu languages = new Menu("Language");
-            for (Locale l : Language.getSupportedLocales()) {
-                languages.addItem(new SimpleMenuItem("?lang=" + l.toString(), l.getDisplayName(l)));
-            }
+            addLanguages(languages);
             categories.add(languages);
             for (Menu menu : categories) {
                 menu.prepare();
@@ -204,6 +205,12 @@ public final class Gigi extends HttpServlet {
             return rootMenu;
         }
 
+        private void addLanguages(Menu languages) {
+            for (Locale l : Language.getSupportedLocales()) {
+                languages.addItem(new SimpleUntranslatedMenuItem("?lang=" + l.toString(), l.getDisplayName(l)));
+            }
+        }
+
         public Map<String, Page> getPages() {
             return Collections.unmodifiableMap(pages);
         }
@@ -223,7 +230,7 @@ public final class Gigi extends HttpServlet {
 
     private static Gigi instance;
 
-    private Template baseTemplate;
+    private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));;
 
     private PingerDaemon pinger;
 
@@ -246,6 +253,8 @@ public final class Gigi extends HttpServlet {
             instance = this;
             DomainAssessment.init(conf);
             DatabaseConnection.init(conf);
+            TimeConditions.init(conf);
+            PasswordHash.init(conf);
             this.truststore = truststore;
             pinger = new PingerDaemon(truststore);
             pinger.start();
@@ -363,7 +372,7 @@ public final class Gigi extends HttpServlet {
         if (req.getParameter("lang") != null) {
             Locale l = Language.getLocaleFromString(req.getParameter("lang"));
             Language lu = Language.getInstance(l);
-            req.getSession().setAttribute(Language.SESSION_ATTRIB_NAME, lu.getLocale());
+            req.getSession().setAttribute(Language.SESSION_ATTRIB_NAME, lu != null ? lu.getLocale() : Locale.ENGLISH);
         }
         final Page p = getPage(req.getPathInfo());