X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailOverview.java;h=6b9000c85d9977faa2b712986fd58e8082cf9f64;hb=e409ba881965634f63f0b67824bc93dda4ec4327;hp=edc88c9477b18fb3cdd49abd7577dcd529219ec6;hpb=7dec4cb4c324be3a48072b615ab0e30d6fd62ec2;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index edc88c94..6b9000c8 100644
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -1,46 +1,50 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.User;
-import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.output.MailTable;
-import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 
 public class MailOverview extends Page {
-	public static final String DEFAULT_PATH = "/account/mails";
-	private MailTable table = new MailTable("mails", "userMail");
-	public MailOverview(String title) {
-		super(title);
-	}
-
-	@Override
-	public void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws IOException {
-		HashMap<String, Object> vars = new HashMap<String, Object>();
-		User us = LoginPage.getUser(req);
-		int id = us.getId();
-		try {
-			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-					"SELECT * from `email` WHERE `memid`=? AND `deleted`=0");
-			ps.setInt(1, id);
-			ResultSet rs = ps.executeQuery();
-			vars.put("mails", rs);
-			vars.put("userMail", us.getEmail());
-
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		table.output(resp.getWriter(), getLanguage(req), vars);
-
-	}
+
+    public static final String DEFAULT_PATH = "/account/mails";
+
+    public MailOverview(String title) {
+        super(title);
+    }
+
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        final User us = getUser(req);
+        Language lang = Page.getLanguage(req);
+        HashMap<String, Object> vars = new HashMap<>();
+        vars.put("addForm", new MailAddForm(req, us));
+        vars.put("manForm", new MailManagementForm(req, us));
+        getDefaultTemplate().output(resp.getWriter(), lang, vars);
+    }
+
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        PrintWriter out = resp.getWriter();
+        if (req.getParameter("addmail") != null) {
+            MailAddForm f = Form.getForm(req, MailAddForm.class);
+            if (f.submit(out, req)) {
+                resp.sendRedirect(MailOverview.DEFAULT_PATH);
+            }
+        } else if (req.getParameter("makedefault") != null || req.getParameter("delete") != null) {
+            MailManagementForm f = Form.getForm(req, MailManagementForm.class);
+            if (f.submit(out, req)) {
+                resp.sendRedirect(MailOverview.DEFAULT_PATH);
+            }
+        }
+        super.doPost(req, resp);
+    }
 
 }