Merge branch 'felix-work'

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 412f02ca601f42b6e29b2a0fbcc0425a4548d041..6363757eaafa55ec51faf049d81f4c85700ae282 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -453,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()]);
     }

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
new file mode 100644 (file)
index 0000000..6357977
--- /dev/null
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
@@ -0,0 +1,34 @@
+package org.cacert.gigi.pages.admin.support;
+
+import java.io.PrintWriter;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.Template;
+
+public class SupportEnterTicketForm extends Form {
+
+    private static Template t;
+    static {
+        t = new Template(SupportEnterTicketForm.class.getResource("SupportEnterTicketForm.templ"));
+    }
+
+    public SupportEnterTicketForm(HttpServletRequest hsr) {
+        super(hsr);
+    }
+
+    @Override
+    public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+        return false;
+    }
+
+    @Override
+    protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
+        t.output(out, l, vars);
+    }
+
+}

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
new file mode 100644 (file)
index 0000000..5a268dc
--- /dev/null
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
@@ -0,0 +1,12 @@
+<table class="wrapper dataTable centertext">
+<tr>
+            <th colspan="2"><?=_Ticket handling?></th>
+        </tr>
+        <tr>
+            <td><?=_Ticket no?>:</td>
+            <td><input type="text" name="ticketno"></td>
+        </tr>
+        <tr>
+            <td colspan="2"><input type="submit" value="<?=_Set ticket number?>"></td>
+        </tr>
+</table>
\ No newline at end of file

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index af5272aa221f205aaab7d08ef81d34dd3180a379..8e6fac089b436e245b881456937adb82e0414da1 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -42,14 +42,15 @@ public class SupportUserDetailsForm extends Form {
         vars.put("suffix", user.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("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);
     }

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
index 2e9cfdf91ca3a78b7b4320c54d6545a1124fddb1..c0329527b41fec7d6a9168cc8c2959a6020f45d8 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
@@ -93,6 +93,16 @@
             <? } else { ?>
             <?=_No?>
             <? } ?>
+</td>
+        </tr>
+        <tr>
+            <td><?=_Supporter?>:</td>
+            <td>
+<? if($supporter) { ?>
+            <?=_Yes?>
+            <? } else { ?>
+            <?=_No?>
+            <? } ?>
 </td>
         </tr>
            <tr>

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index a16ff0760651223b32cc8e4f6549f0db169fdca5..ee807253da0efbe0466428cb8cf4d4292009eb46 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -50,6 +50,7 @@ public class SupportUserDetailsPage extends Page {
             }
         });
         vars.put("certifrevoke", new SupportRevokeCertificatesForm(req, user));
+        vars.put("tickethandling", new SupportEnterTicketForm(req));
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
index fa874c40e881de46c24946e8827a7646969c3c5d..04195c4a17ecf7cd02523791c8608f2dc9ecec05 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
@@ -1,3 +1,5 @@
+<?=$tickethandling?>
+<br/>
 <?=$details?>
 <table class="wrapper dataTable centertext">
         <tbody><tr>