X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=c83cb640d16226a1c0e3e6a592454c017e93d6d3;hb=0c5e049937af92e3c12eb145730841daa18b8df4;hp=f558a6e44543a37fbdbb0374833a3f8bcd36e1df;hpb=330e2b7a3c2e525fee83ee5392df483e1be1f399;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index f558a6e4..c83cb640 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -36,14 +36,15 @@ import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.PasswordResetPage; import org.cacert.gigi.pages.PolicyIndex; import org.cacert.gigi.pages.RootCertPage; 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.MyDetails; import org.cacert.gigi.pages.account.History; +import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.account.UserTrainings; import org.cacert.gigi.pages.account.certs.CertificateAdd; import org.cacert.gigi.pages.account.certs.Certificates; @@ -67,7 +68,7 @@ import org.cacert.gigi.ping.PingerDaemon; import org.cacert.gigi.util.AuthorizationContext; import org.cacert.gigi.util.ServerConstants; -public class Gigi extends HttpServlet { +public final class Gigi extends HttpServlet { private class MenuBuilder { @@ -153,6 +154,9 @@ public class Gigi extends HttpServlet { putPage(History.SUPPORT_PATH, new History(true), null); putPage(UserTrainings.PATH, new UserTrainings(false), "My Account"); putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null); + + putPage(PasswordResetPage.PATH, new PasswordResetPage(), null); + if (testing) { try { Class manager = Class.forName("org.cacert.gigi.pages.Manager"); @@ -362,6 +366,8 @@ public class Gigi extends HttpServlet { return; } HashMap vars = new HashMap(); + // System.out.println(req.getMethod() + ": " + req.getPathInfo() + + // " -> " + p); Outputable content = new Outputable() { @Override