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;
putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates");
putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
- putPage(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust");
+ putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");
putPage(MyListingPage.PATH, new MyListingPage(), "Web of Trust");
putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
}
baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
rootMenu = new MenuCollector();
- Menu about = new Menu("About SomeCA.org");
- categories.add(about);
-
- about.addItem(new SimpleMenuItem("//blog.cacert.org/", "SomeCA News"));
- about.addItem(new SimpleMenuItem("//wiki.cacert.org/", "Wiki Documentation"));
- putPage(PolicyIndex.DEFAULT_PATH, new PolicyIndex(), "About SomeCA.org");
- about.addItem(new SimpleMenuItem("//wiki.cacert.org/FAQ/Privileges", "Point System"));
- about.addItem(new SimpleMenuItem("//bugs.cacert.org/", "Bug Database"));
- about.addItem(new SimpleMenuItem("//wiki.cacert.org/Board", "SomeCA Board"));
- about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists"));
- about.addItem(new SimpleMenuItem("//blog.SomeCA.org/feed", "RSS News Feed"));
- about.addItem(new SimpleMenuItem("//wiki.cacert.org/Impress", "Impress"));
Menu languages = new Menu("Translations");
for (Locale l : Language.getSupportedLocales()) {
vars.put("content", content);
if (currentAuthContext != null) {
// TODO maybe move this information into the AuthContext object
- vars.put("loginMethod", lang.getTranslation((String) req.getSession().getAttribute(LOGIN_METHOD)));
+ vars.put("loginMethod", req.getSession().getAttribute(LOGIN_METHOD));
vars.put("authContext", currentAuthContext);
}
csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure());
- csp.append(";report-url https://api.cacert.org/security/csp/report");
+ //csp.append(";report-url https://api.cacert.org/security/csp/report");
return csp.toString();
}
csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePort());
- csp.append(";report-url http://api.cacert.org/security/csp/report");
+ //csp.append(";report-url http://api.cacert.org/security/csp/report");
return csp.toString();
}