import javax.servlet.http.HttpSession;
import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.DomainPingConfiguration;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.Menu;
import org.cacert.gigi.output.PageMenuItem;
import org.cacert.gigi.output.SimpleMenuItem;
+import org.cacert.gigi.output.template.Form.CSRFException;
import org.cacert.gigi.output.template.Outputable;
import org.cacert.gigi.output.template.Template;
-import org.cacert.gigi.output.template.Form.CSRFException;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.LogoutPage;
import org.cacert.gigi.pages.MainPage;
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.SupportUserDetailsPage;
import org.cacert.gigi.pages.error.AccessDenied;
import org.cacert.gigi.pages.error.PageNotFound;
import org.cacert.gigi.pages.main.RegisterPage;
public static final String USER = "user";
+ public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod";
+
private static final long serialVersionUID = -6386785421902852904L;
private Template baseTemplate;
putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account");
putPage("/secure", new TestSecure(), null);
putPage(Verify.PATH, new Verify(), null);
- putPage(AssurePage.PATH + "/*", new AssurePage(), "CAcert Web of Trust");
+ putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
putPage(MyDetails.PATH, new MyDetails(), "My Account");
putPage(RegisterPage.PATH, new RegisterPage(), "CAcert.org");
putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates");
putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates");
- putPage(MyPoints.PATH, new MyPoints("My Points"), "CAcert Web of Trust");
- putPage(RequestTTPPage.PATH, new RequestTTPPage(), "CAcert Web of Trust");
+ putPage(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust");
+ putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Organisation Admin");
putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
+ putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "System Admin");
+ putPage(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin");
+ putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
if (testing) {
try {
Class<?> manager = Class.forName("org.cacert.gigi.pages.Manager");
}
}
- putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust");
+ putPage("/wot/rules", new StaticPage("Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "Web of Trust");
baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
rootMenu = new Menu("Main");
Menu about = new Menu("About CAcert.org");
}
};
+ Language lang = Page.getLanguage(req);
+
vars.put(Menu.USER_VALUE, currentPageUser);
vars.put("menu", rootMenu);
- vars.put("title", Page.getLanguage(req).getTranslation(p.getTitle()));
+ vars.put("title", lang.getTranslation(p.getTitle()));
vars.put("static", getStaticTemplateVar(isSecure));
vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
vars.put("content", content);
if (currentPageUser != null) {
vars.put("loggedInAs", currentPageUser.getName().toString());
+ vars.put("loginMethod", lang.getTranslation((String) req.getSession().getAttribute(LOGIN_METHOD)));
}
resp.setContentType("text/html; charset=utf-8");
- baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars);
+ baseTemplate.output(resp.getWriter(), lang, vars);
} else {
resp.sendError(404, "Page not found.");
}
return instance.reveresePages.get(p).replaceFirst("/?\\*$", "");
}
- public static void notifyPinger() {
+ /**
+ * Requests Pinging of domains.
+ *
+ * @param toReping
+ * if not null, the {@link DomainPingConfiguration} to test, if
+ * null, just re-check if there is something to do.
+ */
+ public static void notifyPinger(DomainPingConfiguration toReping) {
+ if (toReping != null) {
+ instance.pinger.queue(toReping);
+ }
instance.pinger.interrupt();
}