X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=1108aa04bf26ff2fd40b30b70fc05caba37b2cd8;hb=b2cc7030cc88b71cf8ba1fc808b13428fe9db8ef;hp=9e111ae78449c50b600e7d08294c41c5fa712716;hpb=7243641e3fc1ded767f1070a7300a099ad98ecad;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 9e111ae7..1108aa04 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -68,7 +68,7 @@ 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; @@ -145,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"); @@ -170,6 +170,7 @@ 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); @@ -371,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());