UPD: Rearanged mail overview

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

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index e5744388a08854de2acdccba7d524818f74213a0..54eda005753ad85758dc7154731d6f234fd28766 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,41 +14,85 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.output.MailTable;
+import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.pages.LoginPage;
 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");
+       private MailTable t;
+
        public MailOverview(String title) {
                super(title);
+               t = new MailTable("res", "us");
        }
 
        @Override
        public void doGet(HttpServletRequest req, HttpServletResponse resp)
                        throws IOException {
-               HashMap<String, Object> vars = new HashMap<String, Object>();
-               User us = LoginPage.getUser(req);
+               final User us = LoginPage.getUser(req);
+               Language lang = Page.getLanguage(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());
-
+                       HashMap<String, Object> vars = new HashMap<>();
+                       vars.put("mailData", t);
+                       vars.put("res", rs);
+                       vars.put("us", us.getEmail());
+                       getDefaultTemplate().output(resp.getWriter(), lang, vars);
                } catch (SQLException e) {
                        e.printStackTrace();
                }
-               Language language = getLanguage(req);
-               table.output(resp.getWriter(), language, vars);
-               PrintWriter wri = resp.getWriter();
-               wri.println("<p>");
-               wri.println(language
-                               .getTranslation("Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default."));
-               wri.println("</p>");
        }
 
+       private class MailTable implements Outputable {
+               private String mails, userMail;
+
+               public MailTable(String mails, String userMail) {
+                       this.mails = mails;
+                       this.userMail = userMail;
+               }
+
+               @Override
+               public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+                       try {
+                               ResultSet rs = (ResultSet) vars.get(mails);
+                               String usM = (String) vars.get(userMail);
+                               while (rs.next()) {
+                                       out.println("<tr>");
+                                       out.println("<td class=\"DataTD\"><input type=\"radio\" name=\"emailid\" value=\"");
+                                       int mailID = rs.getInt(1);
+                                       out.print(mailID);
+                                       out.print("\"/></td>");
+                                       out.println("<td class=\"DataTD\">");
+                                       if (rs.getString(7).isEmpty()) {
+                                               out.print(l.getTranslation("Verified"));
+                                       } else {
+                                               out.print(l.getTranslation("Unverified"));
+                                       }
+                                       out.print("</td>");
+                                       out.println("<td class=\"DataTD\">");
+                                       String address = rs.getString(3);
+                                       if (usM.equals(address)) {
+                                               out.print(l.getTranslation("N/A"));
+                                       } else {
+                                               out.print("<input type=\"checkbox\" name=\"delid[]\" value=\"");
+                                               out.print(mailID);
+                                               out.print("\"/>");
+                                       }
+                                       out.print("</td>");
+                                       out.println("<td>");
+                                       out.print(address);
+                                       out.print("</td>");
+                                       out.println("</tr>");
+                               }
+                       } catch (SQLException e) {
+                               e.printStackTrace();
+                       }
+               }
+
+       }
 }