X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=7144ea270870821dcf5c566ea496898ecbfe035c;hb=6184c4270663900df7989ed83a46717389c1a9ac;hp=b4ebf8b770e8652e00cb37091ec3a392857413cb;hpb=8877e3eec96c7db9232e4e2d6478c74de31abfb5;p=gigi.git

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index b4ebf8b7..7144ea27 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -1,7 +1,12 @@
 package org.cacert.gigi;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.security.cert.X509Certificate;
+import java.util.Calendar;
 import java.util.HashMap;
 
 import javax.servlet.ServletException;
@@ -10,14 +15,34 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.MainPage;
+import org.cacert.gigi.pages.Page;
+import org.eclipse.jetty.util.log.Log;
+
 public class Gigi extends HttpServlet {
+	private static final long serialVersionUID = -6386785421902852904L;
+	private String[] baseTemplate;
 	private HashMap<String, Page> pages = new HashMap<String, Page>();
 
 	@Override
 	public void init() throws ServletException {
-		pages.put("/login", new LoginPage());
-		pages.put("/", new MainPage());
+		pages.put("/login", new LoginPage("CACert - Login"));
+		pages.put("/", new MainPage("CACert - Home"));
+		String templ = "";
+		try {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(
+					new FileInputStream(new File("templates/base.html"))));
+			String tmp;
+			while ((tmp = reader.readLine()) != null) {
+				templ += tmp;
+			}
+			baseTemplate = templ.split("\\$content\\$");
+		} catch (Exception e) {
+			Log.getLogger(Gigi.class).warn("Error loading template!", e);
+		}
 		super.init();
+
 	}
 
 	@Override
@@ -58,10 +83,18 @@ public class Gigi extends HttpServlet {
 			resp.sendRedirect("/login");
 			return;
 		}
-		System.out.println(req.getPathInfo());
 		if (pages.containsKey(req.getPathInfo())) {
+			String b0 = baseTemplate[0];
+			int year = Calendar.getInstance().get(Calendar.YEAR);
 			Page p = pages.get(req.getPathInfo());
+			b0 = b0.replaceAll("\\$title\\$", p.getTitle());
+			b0 = b0.replaceAll("\\$year\\$", year + "");
+			resp.getWriter().print(b0);
 			p.doGet(req, resp);
+			String b1 = baseTemplate[1];
+			b1 = b1.replaceAll("\\$title\\$", p.getTitle());
+			b1 = b1.replaceAll("\\$year\\$", year + "");
+			resp.getWriter().print(b1);
 		} else {
 			resp.sendError(404, "Page not found.");
 		}