From: Benny Baumann <BenBE1987@gmx.net>
Date: Thu, 16 Jun 2016 16:48:03 +0000 (+0200)
Subject: Merge changes I5927fb2c,I13853b13
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=bc51ef4b743b32a7cd3f917a65a2884155b589bb;hp=ce8b9c388ddaf73c6b35b7ece7fcdbf8618aee9f

Merge changes I5927fb2c,I13853b13

* changes:
  add: rate limit for Login (+check Signup Limit earlier)
  add: allow manually triggered email reping. (addresses #5)
---

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..99f26c02
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java
index f3bd822b..36119424 100644
--- a/src/org/cacert/gigi/dbObjects/Organisation.java
+++ b/src/org/cacert/gigi/dbObjects/Organisation.java
@@ -189,13 +189,14 @@ public class Organisation extends CertificateOwner {
                 cert.revoke();
             }
         }
-        try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `name`=?, `state`=?, `province`=?, `city`=?, `contactEmail`=?")) {
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `name`=?, `state`=?, `province`=?, `city`=?, `contactEmail`=? WHERE `id`=?")) {
             ps.setString(1, o);
             ps.setString(2, c);
             ps.setString(3, st);
             ps.setString(4, l);
             ps.setString(5, mail);
-            ps.execute();
+            ps.setInt(6, getId());
+            ps.executeUpdate();
         }
         email = mail;
         name = o;