Change cert variable names id -> serial for identification.

certificates are identified by serial, not by names

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index 71fb5b72fb37453b09293ad6cf8d92f000f5c012..378b3a7001fc10e39fc01589eee794ce5ca2356a 100644 (file)
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -32,14 +32,14 @@ public class Certificate {
                this.csr = csr;
        }
 
-       public Certificate(int id) {
+       public Certificate(int serial) {
                try {
                        PreparedStatement ps = DatabaseConnection.getInstance().prepare(
                                "SELECT id,subject, md, csr_name, crt_name,memid FROM `emailcerts` WHERE serial=?");
-                       ps.setInt(1, id);
+                       ps.setInt(1, serial);
                        ResultSet rs = ps.executeQuery();
                        if (!rs.next()) {
-                               throw new IllegalArgumentException("Invalid mid " + id);
+                               throw new IllegalArgumentException("Invalid mid " + serial);
                        }
                        this.id = rs.getInt(1);
                        dn = rs.getString(2);
@@ -47,7 +47,7 @@ public class Certificate {
                        csrName = rs.getString(4);
                        crtName = rs.getString(5);
                        ownerId = rs.getInt(6);
-                       serial = id;
+                       this.serial = serial;
                        rs.close();
                } catch (SQLException e) {
                        e.printStackTrace();

diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/MailCertificates.java
index 2fa6ac097e249b35628bf23312c2f5c5302ecdaf..f073d33a77b2b5ac8f2410a99552f4407c9021eb 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificates.java
@@ -32,8 +32,8 @@ public class MailCertificates extends Page {
                String pi = req.getPathInfo().substring(PATH.length());
                if (pi.length() != 0) {
                        pi = pi.substring(1);
-                       int id = Integer.parseInt(pi);
-                       Certificate c = new Certificate(id);
+                       int serial = Integer.parseInt(pi);
+                       Certificate c = new Certificate(serial);
                        if (LoginPage.getUser(req).getId() != c.getOwnerId()) {
                                out.println(translate(req, "You do not own this certificate."));
                                return;