X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsPage.java;h=f1eed52624011a9463e7ac7ac2af84e3494695a9;hb=4b91927aa8d90226414872ce5b3006d0e0f5d273;hp=fccdd5ee2121fbc6af5db801e468dab3e175b5d6;hpb=f643fac1b939993dd6b32e814aaca58d59f4c2b1;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index fccdd5ee..f1eed526 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -7,10 +7,13 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.SupportedUser;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.pages.Page;
 
@@ -31,6 +34,8 @@ public class SupportUserDetailsPage extends Page {
         SupportUserDetailsForm f = new SupportUserDetailsForm(req, user);
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("details", f);
+        String ticket = (String) req.getSession().getAttribute("ticketNo" + user.getId());
+        vars.put("ticketNo", ticket);
         final EmailAddress[] addrs = user.getEmails();
         vars.put("emails", new IterableDataset() {
 
@@ -38,23 +43,47 @@ public class SupportUserDetailsPage extends Page {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
+                if (i == addrs.length) {
+                    return false;
+                }
                 String address = addrs[i].getAddress();
+                i++;
                 if ( !address.equals(user.getEmail())) {
                     vars.put("secmail", address);
                 }
-                i++;
-                return i != addrs.length - 1;
+                return true;
             }
         });
-        vars.put("certifrevoke", new SupportRevokeCertificatesForm(req, user));
+        vars.put("certifrevoke", new SupportRevokeCertificatesForm(req, new SupportedUser(user, getUser(req), ticket)));
+        vars.put("tickethandling", new SupportEnterTicketForm(req, user));
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            if (req.getParameter("setTicket") != null) {
+
+                if ( !Form.getForm(req, SupportEnterTicketForm.class).submit(resp.getWriter(), req)) {
+                    throw new GigiApiException("Invalid ticket number!");
+                }
+            } else if (req.getParameter("revokeall") != null) {
+                if ( !Form.getForm(req, SupportRevokeCertificatesForm.class).submit(resp.getWriter(), req)) {
+                    throw new GigiApiException("No ticket number set.");
+                }
+            }
+        } catch (GigiApiException e) {
+            e.printStackTrace();
+            e.format(resp.getWriter(), getLanguage(req));
+        }
+        super.doPost(req, resp);
+    }
+
     @Override
     public boolean isPermitted(User u) {
         if (u == null) {
             return false;
         }
-        return u.isInGroup(Group.getByString("supporter"));
+        return u.isInGroup(Group.SUPPORTER);
     }
 }