X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=8cc076e19e6a3839b7e409fb44d69d1033ef4b80;hp=ce0d46a52d81674ec2e4ce75828d85b2ec9ba07f;hb=7dec4cb4c324be3a48072b615ab0e30d6fd62ec2;hpb=4fc466a7d4d7bf71f2cdb62e11eeccfbffdbb274

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index ce0d46a5..8cc076e1 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.Properties;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -14,11 +15,19 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.PolicyRedir;
 import org.cacert.gigi.pages.TestSecure;
+import org.cacert.gigi.pages.Verify;
+import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.MailOverview;
+import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.main.RegisterPage;
+import org.cacert.gigi.pages.wot.AssurePage;
 import org.eclipse.jetty.util.log.Log;
 
 public class Gigi extends HttpServlet {
@@ -28,16 +37,26 @@ public class Gigi extends HttpServlet {
 	private String[] baseTemplate;
 	private HashMap<String, Page> pages = new HashMap<String, Page>();
 
+	public Gigi(Properties conf) {
+		EmailProvider.init(conf);
+		DatabaseConnection.init(conf);
+	}
 	@Override
 	public void init() throws ServletException {
 		pages.put("/login", new LoginPage("CACert - Login"));
 		pages.put("/", new MainPage("CACert - Home"));
 		pages.put("/secure", new TestSecure());
+		pages.put(Verify.PATH, new Verify());
+		pages.put(AssurePage.PATH, new AssurePage());
+		pages.put(MailCertificates.PATH, new MailCertificates());
+		pages.put(MyDetails.PATH, new MyDetails());
 		pages.put(RegisterPage.PATH, new RegisterPage());
+		pages.put(PolicyRedir.PATH, new PolicyRedir());
+		pages.put(MailOverview.DEFAULT_PATH, new MailOverview(
+				"My email addresses"));
 		String templ = "";
-		try {
-			BufferedReader reader = new BufferedReader(new InputStreamReader(
-					new FileInputStream(new File("templates/base.html"))));
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+				new FileInputStream(new File("templates/base.html"))))) {
 			String tmp;
 			while ((tmp = reader.readLine()) != null) {
 				templ += tmp;
@@ -62,12 +81,19 @@ public class Gigi extends HttpServlet {
 			return;
 		}
 
-		if (pages.containsKey(req.getPathInfo())) {
-			Page p = pages.get(req.getPathInfo());
+		Page p = getPage(req.getPathInfo());
+		if (p != null) {
+
 			if (p.needsLogin() && hs.getAttribute("loggedin") == null) {
+				String request = req.getPathInfo();
+				request = request.split("\\?")[0];
+				hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request);
 				resp.sendRedirect("/login");
 				return;
 			}
+			if (p.beforeTemplate(req, resp)) {
+				return;
+			}
 
 			String b0 = baseTemplate[0];
 			b0 = makeDynTempl(b0, p);
@@ -85,6 +111,26 @@ public class Gigi extends HttpServlet {
 			resp.sendError(404, "Page not found.");
 		}
 
+	}
+	private Page getPage(String pathInfo) {
+
+		Page page = pages.get(pathInfo);
+		if (page != null) {
+			return page;
+		}
+		page = pages.get(pathInfo + "/*");
+		if (page != null) {
+			return page;
+		}
+		int idx = pathInfo.lastIndexOf('/');
+		pathInfo = pathInfo.substring(0, idx);
+
+		page = pages.get(pathInfo + "/*");
+		if (page != null) {
+			return page;
+		}
+		return null;
+
 	}
 	private String makeDynTempl(String in, Page p) {
 		int year = Calendar.getInstance().get(Calendar.YEAR);