X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=8900cfc8df5328aef6154bc3dd6d43c4586899b7;hb=8605a0e4eea7319a9790ac89ca3606b80948ca47;hp=54e1ebfe68b8e48f7631e14354623bd7dc7d90dd;hpb=c44ef82f34220feb7ef31c49e0a08a45a884038c;p=gigi.git

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 54e1ebfe..8900cfc8 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -14,7 +14,7 @@ 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.localisation.Language;
 import org.cacert.gigi.output.Form.CSRFException;
 import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.MenuItem;
@@ -27,8 +27,8 @@ import org.cacert.gigi.pages.TestSecure;
 import org.cacert.gigi.pages.Verify;
 import org.cacert.gigi.pages.account.ChangePasswordPage;
 import org.cacert.gigi.pages.account.DomainOverview;
-import org.cacert.gigi.pages.account.MailCertificateAdd;
-import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.CertificateAdd;
+import org.cacert.gigi.pages.account.Certificates;
 import org.cacert.gigi.pages.account.MailOverview;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.error.PageNotFound;
@@ -51,7 +51,6 @@ public class Gigi extends HttpServlet {
     Menu m;
 
     public Gigi(Properties conf) {
-        EmailProvider.init(conf);
         DatabaseConnection.init(conf);
     }
 
@@ -63,11 +62,11 @@ public class Gigi extends HttpServlet {
         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(Certificates.PATH + "/*", new Certificates());
         pages.put(MyDetails.PATH, new MyDetails());
         pages.put(ChangePasswordPage.PATH, new ChangePasswordPage());
         pages.put(RegisterPage.PATH, new RegisterPage());
-        pages.put(MailCertificateAdd.PATH, new MailCertificateAdd());
+        pages.put(CertificateAdd.PATH, new CertificateAdd());
         pages.put(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"));
         pages.put(DomainOverview.PATH, new DomainOverview("Domains"));
         baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));