UPD: Use the ENUM

[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 fccdd5ee2121fbc6af5db801e468dab3e175b5d6..a16ff0760651223b32cc8e4f6549f0db169fdca5 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -38,12 +38,15 @@ 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));
@@ -55,6 +58,6 @@ public class SupportUserDetailsPage extends Page {
         if (u == null) {
             return false;
         }
-        return u.isInGroup(Group.getByString("supporter"));
+        return u.isInGroup(Group.SUPPORTER);
     }
 }