upd: Cleanup lang-string locations

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

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index b0ddb8fee7cdce3cd9ef81590988e1a0ccae555c..726bdd391566bd740b29faf426048d06047e9a5d 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -22,8 +22,8 @@ public class SupportUserDetailsPage extends Page {
 
     public static final String PATH = "/support/user/";
 
-    public SupportUserDetailsPage(String title) {
-        super(title);
+    public SupportUserDetailsPage() {
+        super("Support: User Details");
     }
 
     @Override
@@ -47,15 +47,14 @@ public class SupportUserDetailsPage extends Page {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
-                if (i == addrs.length) {
-                    return false;
+                for (; i < addrs.length;) {
+                    String address = addrs[i++].getAddress();
+                    if ( !address.equals(user.getEmail())) {
+                        vars.put("secmail", address);
+                        return true;
+                    }
                 }
-                String address = addrs[i].getAddress();
-                i++;
-                if ( !address.equals(user.getEmail())) {
-                    vars.put("secmail", address);
-                }
-                return true;
+                return false;
             }
         });
         vars.put("certifrevoke", new SupportRevokeCertificatesForm(req, targetUser));
@@ -69,7 +68,7 @@ public class SupportUserDetailsPage extends Page {
                 if ( !Form.getForm(req, SupportRevokeCertificatesForm.class).submit(resp.getWriter(), req)) {
                     throw new GigiApiException("No ticket number set.");
                 }
-            } else if (req.getParameter("detailupdate") != null) {
+            } else if (req.getParameter("detailupdate") != null || req.getParameter("resetPass") != null || req.getParameter("deny") != null || req.getParameter("grant") != null) {
                 if ( !Form.getForm(req, SupportUserDetailsForm.class).submit(resp.getWriter(), req)) {
                     throw new GigiApiException("No ticket number set.");
                 }