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

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 6d6ddb6e..d584cd09 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -18,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;
@@ -30,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;
@@ -49,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());
@@ -111,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();
 					}
 
 				}