fix: support: no primary email address in list of secondary addresses

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index b0ddb8fee7cdce3cd9ef81590988e1a0ccae555c..a3195367e2f8d32c955c4c3720d6381c366791bc 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -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));

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
index abd4167b510cb0d9503bc21d0366212e46b0faa7..84cb85e269a345d9adcff04fca5fe0310e446ec2 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
@@ -5,12 +5,10 @@
             <th><?=_Alternate Verified Email Addresses?></th>
         </tr>
         <? foreach($emails) {?>
-        <? if($secmail) { ?>
         <tr>
             <td><?=$secmail?></td>
         </tr>
         <? } ?>
-        <? } ?>
         </tbody>
 </table>
 <br/>