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;
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;
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 {
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");
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) {
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 {
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();
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);
}
instance = this;
DomainAssessment.init(conf);
DatabaseConnection.init(conf);
+ TimeConditions.init(conf);
+ PasswordHash.init(conf);
this.truststore = truststore;
pinger = new PingerDaemon(truststore);
pinger.start();