UPD: Store ticket number

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
index 6357977c5ef50ab20ded50d1334ff7921fd1e80b..5db93f30960df3c03c1bdbe4b349b2b7f30871ee 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
+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.Template;
@@ -13,16 +14,25 @@ import org.cacert.gigi.output.template.Template;
 public class SupportEnterTicketForm extends Form {
 
     private static Template t;
+
+    private User target;
     static {
         t = new Template(SupportEnterTicketForm.class.getResource("SupportEnterTicketForm.templ"));
     }
 
-    public SupportEnterTicketForm(HttpServletRequest hsr) {
+    public SupportEnterTicketForm(HttpServletRequest hsr, User target) {
         super(hsr);
+        this.target = target;
     }
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+        // [asdmASDM]\d{8}\.\d+
+        String ticket = req.getParameter("ticketno");
+        if (ticket.matches("[asdmASDM]\\d{8}\\.\\d+")) {
+            req.getSession().setAttribute("ticketNo" + target.getId(), ticket);
+            return true;
+        }
         return false;
     }
 

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
index 5a268dc8ec456224f40f45a762d9a7445cb04625..fe9c34fb2eba72b7113d240da04412f8f3d9e942 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
@@ -4,9 +4,9 @@
         </tr>
         <tr>
             <td><?=_Ticket no?>:</td>
-            <td><input type="text" name="ticketno"></td>
+            <td><input type="text" <? if($ticketNo) {?>value="<?=$ticketNo?>" <? } ?>name="ticketno"></td>
         </tr>
         <tr>
-            <td colspan="2"><input type="submit" value="<?=_Set ticket number?>"></td>
+            <td colspan="2"><input type="submit" name="setTicket" value="<?=_Set ticket number?>"></td>
         </tr>
 </table>
\ No newline at end of file

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index ee807253da0efbe0466428cb8cf4d4292009eb46..70146d5f8caa63d9d863d6790972dd412dfc69bd 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -7,10 +7,12 @@ 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.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 +33,7 @@ public class SupportUserDetailsPage extends Page {
         SupportUserDetailsForm f = new SupportUserDetailsForm(req, user);
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("details", f);
+        vars.put("ticketNo", req.getSession().getAttribute("ticketNo" + user.getId()));
         final EmailAddress[] addrs = user.getEmails();
         vars.put("emails", new IterableDataset() {
 
@@ -50,10 +53,25 @@ public class SupportUserDetailsPage extends Page {
             }
         });
         vars.put("certifrevoke", new SupportRevokeCertificatesForm(req, user));
-        vars.put("tickethandling", new SupportEnterTicketForm(req));
+        vars.put("tickethandling", new SupportEnterTicketForm(req, user));
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        if (req.getParameter("setTicket") != null) {
+            try {
+                if ( !Form.getForm(req, SupportEnterTicketForm.class).submit(resp.getWriter(), req)) {
+                    throw new GigiApiException("Invalid ticket number!");
+                }
+            } catch (GigiApiException e) {
+                e.printStackTrace();
+                e.format(resp.getWriter(), getLanguage(req));
+            }
+        }
+        super.doPost(req, resp);
+    }
+
     @Override
     public boolean isPermitted(User u) {
         if (u == null) {