add: testcase for the previous bug

[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 f12002334566923764067289aa1f9cb39c281d12..f67e81928a6dfc92b1bef81f71b8dc6ad8d65fe1 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -98,10 +98,6 @@ public class User extends CertificateOwner {
         return email;
     }
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
     public void changePassword(String oldPass, String newPass) throws GigiApiException {
         GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM `users` WHERE `id`=?");
         ps.setInt(1, getId());
@@ -469,19 +465,6 @@ public class User extends CertificateOwner {
         return false;
     }
 
-    public String[] getAdminLog() {
-        GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT `when`, type, information FROM `adminLog` WHERE uid=? ORDER BY `when` ASC");
-        prep.setInt(1, getId());
-        GigiResultSet res = prep.executeQuery();
-        List<String> entries = new LinkedList<String>();
-
-        while (res.next()) {
-            entries.add(res.getString(2) + " (" + res.getString(3) + ")");
-        }
-
-        return entries.toArray(new String[0]);
-    }
-
     public String[] getTrainings() {
         GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT `pass_date`, `type_text` FROM `cats_passed` LEFT JOIN `cats_type` ON `cats_type`.`id`=`cats_passed`.`variant_id`  WHERE `user_id`=? ORDER BY `pass_date` ASC");
         prep.setInt(1, getId());