[Database] implement the stuff for requesting domain reping.

[gigi.git] / src / org / cacert / gigi / Gigi.java
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java

index a65d5c94312b23418dd39604ddbbf9cb73499283..82ca12655cae358d32f00b19d47882d38d8665b1 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -35,12 +35,12 @@ 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.CertificateAdd;
-import org.cacert.gigi.pages.account.Certificates;
  import org.cacert.gigi.pages.account.ChangePasswordPage;
-import org.cacert.gigi.pages.account.DomainOverview;
-import org.cacert.gigi.pages.account.MailOverview;
  import org.cacert.gigi.pages.account.MyDetails;
+import org.cacert.gigi.pages.account.certs.CertificateAdd;
+import org.cacert.gigi.pages.account.certs.Certificates;
+import org.cacert.gigi.pages.account.domain.DomainOverview;
+import org.cacert.gigi.pages.account.mail.MailOverview;
  import org.cacert.gigi.pages.error.PageNotFound;
  import org.cacert.gigi.pages.main.RegisterPage;
  import org.cacert.gigi.pages.wot.AssurePage;
@@ -89,9 +89,9 @@ public class Gigi extends HttpServlet {
      public void init() throws ServletException {
          if ( !firstInstanceInited) {
              putPage("/error", new PageNotFound(), null);
-            putPage("/login", new LoginPage("CAcert - Login"), "Join CAcert.org");
+            putPage("/login", new LoginPage("CAcert - Login"), "CAcert.org");
              putPage("/", new MainPage("CAcert - Home"), null);
-            putPage("/roots", new RootCertPage(truststore), "Join CAcert.org");
+            putPage("/roots", new RootCertPage(truststore), "CAcert.org");
              putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
              putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account");
              putPage("/secure", new TestSecure(), null);
@@ -99,7 +99,7 @@ public class Gigi extends HttpServlet {
              putPage(AssurePage.PATH + "/*", new AssurePage(), "CAcert Web of Trust");
              putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
              putPage(MyDetails.PATH, new MyDetails(), "My Account");
-            putPage(RegisterPage.PATH, new RegisterPage(), "Join CAcert.org");
+            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");
@@ -178,7 +178,6 @@ public class Gigi extends HttpServlet {
      protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
          boolean isSecure = req.getServerPort() == ServerConstants.getSecurePort();
          addXSSHeaders(resp, isSecure);
-        resp.setContentType("text/html; charset=utf-8");
          // Firefox only sends this, if it's a cross domain access; safari sends
          // it always
          String originHeader = req.getHeader("Origin");
@@ -187,8 +186,8 @@ public class Gigi extends HttpServlet {
                  !(originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getWwwHostNamePortSecure()) + "(/.*|)") || //
                          originHeader.matches("^" + Pattern.quote("http://" + ServerConstants.getWwwHostNamePort()) + "(/.*|)") || //
                  originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getSecureHostNamePort()) + "(/.*|)"))) {
+            resp.setContentType("text/html; charset=utf-8");
              resp.getWriter().println("<html><head><title>Alert</title></head><body>No cross domain access allowed.<br/><b>If you don't know why you're seeing this you may have been fished! Please change your password immediately!</b></body></html>");
-            System.out.println(originHeader);
              return;
          }
          HttpSession hs = req.getSession();
@@ -247,6 +246,7 @@ public class Gigi extends HttpServlet {
              vars.put("static", getStaticTemplateVar(isSecure));
              vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
              vars.put("content", content);
+            resp.setContentType("text/html; charset=utf-8");
              baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars);
          } else {
              resp.sendError(404, "Page not found.");