X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=7740f803fc947cf6bd0c8f6c75d91122d158e4cf;hp=6018849991e13ac454748d9b15b05e1a418b7da6;hb=1d08cc98005de07c416207536bcae3592fbc7b73;hpb=796edd7987d09c70f0eed74ebd648fefa889e8a8

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 60188499..7740f803 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -58,6 +58,7 @@ 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.FindCertPage;
 import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
 import org.cacert.gigi.pages.admin.support.FindUserByEmailPage;
 import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
@@ -68,7 +69,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;
@@ -138,14 +139,14 @@ public final class Gigi extends HttpServlet {
 
             putPage("/secure", new TestSecure(), null);
             putPage(Verify.PATH, new Verify(), null);
-            putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
+            putPage(Certificates.PATH + "/*", new Certificates(false), "Certificates");
             putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org");
             putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
             putPage(MailOverview.DEFAULT_PATH, new MailOverview(), "Certificates");
             putPage(DomainOverview.PATH + "*", new DomainOverview(), "Certificates");
 
             putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
-            putPage(MyPoints.PATH, new MyPoints(false), "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");
@@ -155,6 +156,7 @@ public final class Gigi extends HttpServlet {
             putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
             putPage(FindUserByEmailPage.PATH, new FindUserByEmailPage(), "Support Console");
             putPage(FindUserByDomainPage.PATH, new FindUserByDomainPage(), "Support Console");
+            putPage(FindCertPage.PATH, new FindCertPage(), "Support Console");
 
             putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null);
             putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
@@ -170,7 +172,8 @@ 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(MyPoints.SUPPORT_PATH, new MyPoints(true), null);
+            putPage(Points.SUPPORT_PATH, new Points(true), null);
+            putPage(Certificates.SUPPORT_PATH + "/*", new Certificates(true), null);
 
             putPage(PasswordResetPage.PATH, new PasswordResetPage(), null);
             putPage(LogoutPage.PATH, new LogoutPage(), null);
@@ -372,7 +375,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());