ADD: expires headers.

[gigi.git] / src / org / cacert / gigi / dbObjects / User.java

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 75c242f7ae9243df01d4d3bdf822a3e785613d6f..6363757eaafa55ec51faf049d81f4c85700ae282 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -141,9 +141,11 @@ public class User extends CertificateOwner {
         ps = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=? WHERE id=?");
         ps.setString(1, PasswordHash.hash(newPass));
         ps.setInt(2, getId());
-        if (ps.executeUpdate() != 1) {
-            throw new GigiApiException("Password update failed.");
-        }
+        ps.executeUpdate();
+    }
+
+    public void setName(Name name) {
+        this.name = name;
     }
 
     public boolean canAssure() {
@@ -451,7 +453,6 @@ public class User extends CertificateOwner {
         GigiResultSet rs = ps.executeQuery();
         while (rs.next()) {
             results.add(User.getById(rs.getInt(1)));
-            System.out.println("Found user");
         }
         return results.toArray(new User[results.size()]);
     }
@@ -466,7 +467,7 @@ public class User extends CertificateOwner {
             return getAssurancePoints() > 50 && isInGroup(Group.getByString("codesigning"));
         case 3:
         case 4:
-            return false; // has an orga
+            return getOrganisations().size() > 0;
         default:
             return false;
         }