Merge remote-tracking branch 'origin/emailMgmt'

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index e1bd2d6d498b60952ddecfbae14953faf4196527..7a13b45f945d1b1935032102ac0732d18b7f9411 100644 (file)
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -123,7 +123,6 @@ public class Certificate {
                PreparedStatement inserter = DatabaseConnection.getInstance().prepare(
                        "INSERT INTO emailcerts SET md=?, subject=?, csr_type=?, crt_name='', memid=?");
                inserter.setString(1, md);
-               System.out.println(csrType.toString());
                inserter.setString(2, dn);
                inserter.setString(3, csrType.toString());
                inserter.setInt(4, ownerId);

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index d584cd0956b3e68446fb0eb37b546ea25be1c035..9d1bb1b9afb4b84f56bae564ec02e7dc3fa47721 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -109,6 +109,9 @@ public class Gigi extends HttpServlet {
                                public void output(PrintWriter out, Language l, Map<String, Object> vars) {
                                        try {
                                                if (req.getMethod().equals("POST")) {
+                                                       if (req.getQueryString() != null) {
+                                                               return;
+                                                       }
                                                        p.doPost(req, resp);
                                                } else {
                                                        p.doGet(req, resp);