From 84b6b25e4e79ea15ba48cbd83eaf2900aef776b4 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 16 Jan 2015 14:00:38 +0100
Subject: [PATCH] FIX: Secoundary EMail display

---
 .../gigi/pages/admin/support/SupportUserDetailsPage.java   | 7 +++++--
 .../gigi/pages/admin/support/SupportUserDetailsPage.templ  | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index fccdd5ee..57925325 100644
--- 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));
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
index 8eed2bb3..fa874c40 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
@@ -4,10 +4,12 @@
             <th><?=_Alternate Verified Email Addresses?></th>
         </tr>
         <? foreach($emails) {?>
+        <? if($secmail) { ?>
         <tr>
             <td><?=$secmail?></td>
         </tr>
         <? } ?>
+        <? } ?>
         </tbody>
 </table>
 <br/>
-- 
2.39.2