UPD: Rearanged mail overview

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index a4dba582cda8f3ec5b20695a1a3988754ce726a8..54eda005753ad85758dc7154731d6f234fd28766 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -1,38 +1,98 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;

+import java.io.PrintWriter;

 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 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;
 
 
 import javax.servlet.http.HttpServletRequest;
 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.User;
 import org.cacert.gigi.database.DatabaseConnection;

+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";
 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 t;

 
        public MailOverview(String title) {
                super(title);
 
        public MailOverview(String title) {
                super(title);

+               t = new MailTable("res", "us");

        }
 
        @Override
        public void doGet(HttpServletRequest req, HttpServletResponse resp)
                        throws IOException {
        }
 
        @Override
        public void doGet(HttpServletRequest req, HttpServletResponse resp)
                        throws IOException {

-               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();
                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();

+                       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();
                }
        }
 
                } catch (SQLException e) {
                        e.printStackTrace();
                }
        }
 

+       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();
+                       }
+               }
+
+       }

 }
 }

diff --git a/src/org/cacert/gigi/pages/account/mailOverview.templ b/src/org/cacert/gigi/pages/account/mailOverview.templ
index 3dc1e8c9656d306e57275b4d019386b232fa39e8..746f0c1038fa94e0ec680a0b7a80d5d8acdcbbb4 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mailOverview.templ
+++ b/src/org/cacert/gigi/pages/account/mailOverview.templ
@@ -1,18 +1,14 @@
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>

-    <td colspan="4" class="title"><?=?></td>
+    <td colspan="4" class="title"><?=_Email Accounts?></td>

   </tr>
   <tr>
     <td class="DataTD"><?=_Default?></td>
     <td class="DataTD"><?=_Status?></td>
     <td class="DataTD"><?=_Delete?></td>
     <td class="DataTD"><?=_Address?></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_Default?></td>
     <td class="DataTD"><?=_Status?></td>
     <td class="DataTD"><?=_Delete?></td>
     <td class="DataTD"><?=_Address?></td>

-  </tr><tr>
-    <td class="DataTD"><input type="radio" name="emailid" value="409577" checked=""></td>
-    <td class="DataTD">Überprüft</td>
-    <td class="DataTD">nicht zutreffend</td>
-    <td class="DataTD">janis@dogcraft.de</td>

   </tr>
   </tr>

+ <?=$mailData?>

   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="makedefault" value="Setze als Standard"></td>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="Löschen"></td>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="makedefault" value="Setze als Standard"></td>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="Löschen"></td>


@@ -34,4 +30,7 @@
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_I own or am authorised to control this email address?>"></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_I own or am authorised to control this email address?>"></td>
   </tr>

-</tbody></table>
\ No newline at end of file
+</tbody></table>
+<p>
+<?=_Currently we only issue certificates for Punycode domains if the person requesting them has code signing attributes attached to their account, as these have potentially slightly higher security risk.?>
+</p>
\ No newline at end of file