ADD: Use a "SupportedUser" for the user details form

[gigi.git] / src / org / cacert / gigi / pages / admin / support / SupportUserDetailsForm.java

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index af5272aa221f205aaab7d08ef81d34dd3180a379..737a94c116b7c99fda767144fbc54d71ee2055d6 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.Name;
+import org.cacert.gigi.dbObjects.SupportedUser;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
@@ -17,39 +19,43 @@ public class SupportUserDetailsForm extends Form {
 
     private static Template t;
 
-    private User user;
+    private SupportedUser user;
 
     static {
         t = new Template(FindDomainForm.class.getResource("SupportUserDetailsForm.templ"));
     }
 
-    public SupportUserDetailsForm(HttpServletRequest hsr, User user) {
+    public SupportUserDetailsForm(HttpServletRequest hsr, SupportedUser user) {
         super(hsr);
         this.user = user;
     }
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+
         return false;
     }
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
+        User user = this.user.getTargetUser();
+        Name name = user.getName();
         vars.put("mail", user.getEmail());
-        vars.put("fname", user.getFname());
-        vars.put("mname", user.getMname());
-        vars.put("lname", user.getLname());
-        vars.put("suffix", user.getSuffix());
+        vars.put("fname", name.getFname());
+        vars.put("mname", name.getMname());
+        vars.put("lname", name.getLname());
+        vars.put("suffix", name.getSuffix());
         vars.put("assurer", user.canAssure());
-        vars.put("dob", new DateSelector("dobd", "dobm", "doby", user.getDob()));
-        vars.put("blockedassurer", user.isInGroup(Group.getByString("blockedassurer")));
-        vars.put("codesign", user.isInGroup(Group.getByString("codesigning")));
-        vars.put("orgassurer", user.isInGroup(Group.getByString("orgassurer")));
+        vars.put("dob", new DateSelector("dobd", "dobm", "doby", user.getDoB()));
+        vars.put("blockedassurer", user.isInGroup(Group.BLOCKEDASSURER));
+        vars.put("codesign", user.isInGroup(Group.CODESIGNING));
+        vars.put("orgassurer", user.isInGroup(Group.ORGASSURER));
         vars.put("assurancepoints", user.getAssurancePoints());
-        vars.put("blockedassuree", user.isInGroup(Group.getByString("blockedassuree")));
-        vars.put("ttpassurer", user.isInGroup(Group.getByString("ttpassurer")));
-        vars.put("ttpapplicant", user.isInGroup(Group.getByString("ttpapplicant")));
-        vars.put("blockedlogin", user.isInGroup(Group.getByString("blockedlogin")));
+        vars.put("blockedassuree", user.isInGroup(Group.BLOCKEDASSUREE));
+        vars.put("ttpassurer", user.isInGroup(Group.TTP_ASSURER));
+        vars.put("ttpapplicant", user.isInGroup(Group.TTP_APPLICANT));
+        vars.put("blockedlogin", user.isInGroup(Group.BLOCKEDLOGIN));
+        vars.put("supporter", user.isInGroup(Group.SUPPORTER));
         vars.put("id", user.getId());
         t.output(out, l, vars);
     }