Remove "list all emails from user"-queries.

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

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
index 3cbb537d05c16111ddac3c33b11fbc7c9d8c44fb..c25db15f89cf18f426ed9703f682a2740d9b4d47 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
@@ -1,21 +1,11 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Map;
-
 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.output.template.IterableDataset;
-import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.Certificate;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
@@ -34,34 +24,7 @@ public class MailCertificateAdd extends Page {
                HashMap<String, Object> vars = new HashMap<String, Object>();
                vars.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
 
-               User u = LoginPage.getUser(req);
-               try {
-                       PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-                               "SELECT `id`,`email` from `email` WHERE `memid`=? AND `deleted`=0");
-                       ps.setInt(1, u.getId());
-                       final ResultSet rs = ps.executeQuery();
-                       vars.put("emails", new IterableDataset() {
-
-                               @Override
-                               public boolean next(Language l, Map<String, Object> vars) {
-                                       try {
-                                               if (!rs.next()) {
-                                                       return false;
-                                               }
-                                               vars.put("id", rs.getString(1));
-                                               vars.put("value", rs.getString(2));
-                                               return true;
-                                       } catch (SQLException e) {
-                                               e.printStackTrace();
-                                       }
-                                       return false;
-                               }
-                       });
-                       t.output(resp.getWriter(), getLanguage(req), vars);
-                       rs.close();
-               } catch (SQLException e) {
-                       e.printStackTrace();
-               }
+               t.output(resp.getWriter(), getLanguage(req), vars);
        }
 
        @Override