X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsPage.java;h=234448088d91f5bcaa82b1eb357f8f81c25995db;hb=39bf8d9363076e87bab590b9dec48cea36a2b872;hp=b9368e42edbb44872729afdb2b002ffe465a4a1b;hpb=5455212f844579b906488b025ea4142ee09aa31d;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 b9368e42..23444808 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -1,21 +1,19 @@
 package org.cacert.gigi.pages.admin.support;
 
 import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.dbObjects.Certificate;
-import org.cacert.gigi.dbObjects.CertificateProfile;
+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.DateSelector;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.pages.Page;
 
@@ -33,9 +31,11 @@ public class SupportUserDetailsPage extends Page {
         String[] idP = req.getPathInfo().split("/");
         id = Integer.parseInt(idP[idP.length - 1]);
         final User user = User.getById(id);
-        SupportUserDetailsForm f = new SupportUserDetailsForm(req, user);
+        String ticket = (String) req.getSession().getAttribute("ticketNo" + user.getId());
+        SupportUserDetailsForm f = new SupportUserDetailsForm(req, new SupportedUser(user, getUser(req), ticket));
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("details", f);
+        vars.put("ticketNo", ticket);
         final EmailAddress[] addrs = user.getEmails();
         vars.put("emails", new IterableDataset() {
 
@@ -43,56 +43,44 @@ 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;
             }
         });
-        final Certificate[] certs = user.getCertificates(true);
-        final CertificateProfile[] profiles = CertificateProfile.getAll();
-        vars.put("types", new IterableDataset() {
+        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);
+    }
 
-            int typeIndex = 0;
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            if (req.getParameter("setTicket") != null) {
 
-            @Override
-            public boolean next(Language l, Map<String, Object> vars) {
-                if (typeIndex > profiles.length - 1) {
-                    return false;
+                if ( !Form.getForm(req, SupportEnterTicketForm.class).submit(resp.getWriter(), req)) {
+                    throw new GigiApiException("Invalid ticket number!");
                 }
-                int valid = 0;
-                int total = 0;
-                long lastExpire = Long.MIN_VALUE;
-                for (int i = 0; i < certs.length; i++) {
-                    try {
-                        if (certs[i].getProfile().getId() != profiles[typeIndex].getId()) {
-                            continue;
-                        }
-                        total++;
-                        certs[i].cert().checkValidity();
-                        lastExpire = Math.max(lastExpire, certs[i].cert().getNotAfter().getTime());
-                        valid++;
-                    } catch (GeneralSecurityException | IOException e) {
-                        continue;
-                    }
+            } else if (req.getParameter("revokeall") != null) {
+                if ( !Form.getForm(req, SupportRevokeCertificatesForm.class).submit(resp.getWriter(), req)) {
+                    throw new GigiApiException("No ticket number set.");
                 }
-                vars.put("total", total);
-                vars.put("profile", profiles[typeIndex].getVisibleName());
-                vars.put("valid", valid);
-                vars.put("exp", total - valid);
-                vars.put("rev", "TODO");
-                if (lastExpire == Long.MIN_VALUE) {
-                    vars.put("lastdate", "-");
-                } else {
-                    vars.put("lastdate", DateSelector.getDateFormat().format(new Date(lastExpire)));
+            } else if (req.getParameter("detailupdate") != null) {
+                if ( !Form.getForm(req, SupportUserDetailsForm.class).submit(resp.getWriter(), req)) {
+                    throw new GigiApiException("No ticket number set.");
                 }
-                typeIndex++;
-                return true;
             }
-        });
-        getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
+        } catch (GigiApiException e) {
+            e.printStackTrace();
+            e.format(resp.getWriter(), getLanguage(req));
+        }
+        super.doPost(req, resp);
     }
 
     @Override
@@ -100,6 +88,6 @@ public class SupportUserDetailsPage extends Page {
         if (u == null) {
             return false;
         }
-        return u.isInGroup(Group.getByString("supporter"));
+        return u.isInGroup(Group.SUPPORTER);
     }
 }