X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=d584cd0956b3e68446fb0eb37b546ea25be1c035;hb=2cbe88c14309c3a10dab336cb395c3e995d81ec5;hp=c49cdcbbe673a92888321b8ff94d300773115e12;hpb=0c19a843c23f61cf32f555355a9fa1baf9c8f8f1;p=gigi.git

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index c49cdcbb..d584cd09 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -1,7 +1,6 @@
 package org.cacert.gigi;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Calendar;
 import java.util.HashMap;
@@ -19,8 +18,8 @@ import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.MenuItem;
 import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.Template;
-import org.cacert.gigi.output.Form.CSRFError;
+import org.cacert.gigi.output.Form.CSRFException;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
@@ -31,6 +30,7 @@ import org.cacert.gigi.pages.account.MailCertificateAdd;
 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.error.PageNotFound;
 import org.cacert.gigi.pages.main.RegisterPage;
 import org.cacert.gigi.pages.wot.AssurePage;
 import org.cacert.gigi.util.ServerConstants;
@@ -50,6 +50,7 @@ public class Gigi extends HttpServlet {
 
 	@Override
 	public void init() throws ServletException {
+		pages.put("/error", new PageNotFound());
 		pages.put("/login", new LoginPage("CACert - Login"));
 		pages.put("/", new MainPage("CACert - Home"));
 		pages.put("/secure", new TestSecure());
@@ -61,7 +62,7 @@ public class Gigi extends HttpServlet {
 		pages.put(RegisterPage.PATH, new RegisterPage());
 		pages.put(MailCertificateAdd.PATH, new MailCertificateAdd());
 		pages.put(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"));
-		baseTemplate = new Template(new InputStreamReader(Gigi.class.getResourceAsStream("Gigi.templ")));
+		baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
 		m = new Menu("Certificates", "cert", new MenuItem(MailOverview.DEFAULT_PATH, "Emails"), new MenuItem("",
 			"Client Certificates"), new MenuItem("", "Domains"), new MenuItem("", "Server Certificates"));
 		super.init();
@@ -112,14 +113,14 @@ public class Gigi extends HttpServlet {
 						} else {
 							p.doGet(req, resp);
 						}
-					} catch (IOException e) {
-						e.printStackTrace();
-					} catch (CSRFError err) {
+					} catch (CSRFException err) {
 						try {
 							resp.sendError(500, "CSRF invalid");
 						} catch (IOException e) {
 							e.printStackTrace();
 						}
+					} catch (IOException e) {
+						e.printStackTrace();
 					}
 
 				}