X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FIssueCertificateForm.java;h=a0dad7fd3753131eca9f003964f52d8103c9d182;hp=29565e0ee038a4c5e61de7fa9c80d6f1035e93df;hb=09f0476b47711ec02bb96bdd2090ea1930f434a5;hpb=5725fc461f2f5d3d767a9d2d445eff96857287a5

diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
index 29565e0e..a0dad7fd 100644
--- a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
+++ b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
@@ -7,19 +7,18 @@ import java.security.PublicKey;
 import java.security.interfaces.DSAPublicKey;
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPublicKey;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+
 import org.cacert.gigi.Certificate;
 import org.cacert.gigi.Digest;
+import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.HashAlgorithms;
 import org.cacert.gigi.output.template.IterableDataset;
@@ -128,33 +127,23 @@ public class IssueCertificateForm extends Form {
 		HashMap<String, Object> vars2 = new HashMap<String, Object>(vars);
 		vars2.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
 
-		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();
-			vars2.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();
-					}
+		final EmailAddress[] ea = u.getEmails();
+		vars2.put("emails", new IterableDataset() {
+			int count;
+
+			@Override
+			public boolean next(Language l, Map<String, Object> vars) {
+				if (count >= ea.length) {
 					return false;
 				}
-			});
-			vars2.put("hashs", new HashAlgorithms(selectedDigest));
-			t.output(out, l, vars2);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
+				vars.put("id", ea[count].getId());
+				vars.put("value", ea[count].getAddress());
+				count++;
+				return true;
+			}
+		});
+		vars2.put("hashs", new HashAlgorithms(selectedDigest));
+		t.output(out, l, vars2);
 	}
 
 }