X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificates.java;fp=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificates.java;h=56a0b5bd5cf780573f0fe5f47baa05cd89548273;hb=28e686114d3a851a8f3163862b0c4ec4de3eacce;hp=e0dd947a06d3dfe37c47683f4c3ec9b8ee3e3b5a;hpb=baa0986163014f20ca273c1502754940f60b7d41;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/MailCertificates.java
index e0dd947a..56a0b5bd 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificates.java
@@ -45,16 +45,10 @@ public class MailCertificates extends Page {
 			cer = true;
 			pi = pi.substring(0, pi.length() - 4);
 		}
-		int serial = 0;
+		String serial = pi;
 		try {
-			serial = Integer.parseInt(pi);
-		} catch (NumberFormatException nfe) {
-			resp.sendError(404);
-			return true;
-		}
-		try {
-			Certificate c = new Certificate(serial);
-			if (LoginPage.getUser(req).getId() != c.getOwnerId()) {
+			Certificate c = Certificate.getBySerial(serial);
+			if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
 				resp.sendError(404);
 				return true;
 			}
@@ -92,15 +86,8 @@ public class MailCertificates extends Page {
 		if (pi.length() != 0) {
 			pi = pi.substring(1);
 
-			int serial = 0;
-			try {
-				serial = Integer.parseInt(pi);
-			} catch (NumberFormatException nfe) {
-			}
-			Certificate c = null;
-			if (serial != 0) {
-				c = new Certificate(serial);
-			}
+			String serial = pi;
+			Certificate c = Certificate.getBySerial(serial);
 			if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
 				resp.sendError(404);
 				return;