Merge "Update notes about password security"

[gigi.git] / src / org / cacert / gigi / pages / account / mail / MailOverview.java

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
index b875ded430123537b79c74d727047832a5d9cba1..da3befd581b214c57a284431de6e9b2d7d11d522 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
@@ -9,15 +9,16 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class MailOverview extends Page {
 
     public static final String DEFAULT_PATH = "/account/mails";
 
-    public MailOverview(String title) {
-        super(title);
+    public MailOverview() {
+        super("Email addresses");
     }
 
     @Override
@@ -38,7 +39,7 @@ public class MailOverview extends Page {
             if (f.submit(out, req)) {
                 resp.sendRedirect(MailOverview.DEFAULT_PATH);
             }
-        } else if (req.getParameter("makedefault") != null || req.getParameter("delete") != null) {
+        } else {
             MailManagementForm f = Form.getForm(req, MailManagementForm.class);
             if (f.submit(out, req)) {
                 resp.sendRedirect(MailOverview.DEFAULT_PATH);
@@ -47,4 +48,8 @@ public class MailOverview extends Page {
         super.doPost(req, resp);
     }
 
+    @Override
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.getTarget() instanceof User;
+    }
 }