Merge branch 'felix-work'

[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 cf9c40b91fe3fd60cd16041338cfc563838d2f6c..6363757eaafa55ec51faf049d81f4c85700ae282 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -132,7 +133,7 @@ public class User extends CertificateOwner {
         if ( !rs.next()) {
             throw new GigiApiException("User not found... very bad.");
         }
-        if ( !PasswordHash.verifyHash(oldPass, rs.getString(1))) {
+        if (PasswordHash.verifyHash(oldPass, rs.getString(1)) == null) {
             throw new GigiApiException("Old password does not match.");
         }
         rs.close();
@@ -140,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() {
@@ -443,6 +446,17 @@ public class User extends CertificateOwner {
         return User.getById(rs.getInt(1));
     }
 
+    public static User[] findByEmail(String mail) {
+        LinkedList<User> results = new LinkedList<User>();
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT users.id FROM users inner join certOwners on certOwners.id=users.id WHERE users.email LIKE ? AND deleted is null GROUP BY users.id ASC LIMIT 100");
+        ps.setString(1, mail);
+        GigiResultSet rs = ps.executeQuery();
+        while (rs.next()) {
+            results.add(User.getById(rs.getInt(1)));
+        }
+        return results.toArray(new User[results.size()]);
+    }
+
     public boolean canIssue(CertificateProfile p) {
         switch (p.getCAId()) {
         case 0:
@@ -453,9 +467,10 @@ 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;
         }
     }
+
 }