X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=41e504f8fbb29b2a99ebf6c0354bd11a5f0c93b6;hp=37d0e62a0b6cdda673ecf668f9bf806d5353b115;hb=0a72fb51898c89d155f959dc8fb15c52e017a731;hpb=4b9842acd7dd0e79de8fc3f88cb8241f9b2f134e diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 37d0e62a..41e504f8 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.template.Form; import org.cacert.gigi.output.template.Form.CSRFException; import org.cacert.gigi.output.template.Outputable; import org.cacert.gigi.output.template.Template; @@ -39,6 +40,7 @@ import org.cacert.gigi.pages.HandlesMixedRequest; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; +import org.cacert.gigi.pages.OneFormPage; import org.cacert.gigi.pages.Page; import org.cacert.gigi.pages.PasswordResetPage; import org.cacert.gigi.pages.RootCertPage; @@ -46,6 +48,7 @@ import org.cacert.gigi.pages.StaticPage; import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; import org.cacert.gigi.pages.account.ChangePasswordPage; +import org.cacert.gigi.pages.account.FindAgentAccess; import org.cacert.gigi.pages.account.History; import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.account.UserTrainings; @@ -152,14 +155,21 @@ public final class Gigi extends HttpServlet { 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) { + + @Override + public String getSuccessPath(Form f) { + return FindAgentAccess.PATH; + } + }, "My Account"); putPage(History.SUPPORT_PATH, new History(true), null); putPage(UserTrainings.PATH, new UserTrainings(false), "My Account"); putPage(MyDetails.PATH, new MyDetails(), "My Account"); putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null); putPage(PasswordResetPage.PATH, new PasswordResetPage(), null); + putPage(LogoutPage.PATH, new LogoutPage(), null); if (testing) { try { @@ -177,7 +187,6 @@ 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"); @@ -213,7 +222,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;