From 823aef539f73838a1bea6e0c108904a6346e8db4 Mon Sep 17 00:00:00 2001
From: INOPIAE <m.maengel@inopiae.de>
Date: Mon, 1 Aug 2016 09:06:51 +0200
Subject: [PATCH] add: show verification status of email address for support

fixes issue #101

Change-Id: I6dffa325821fd92fc86ee1e97287998eb90da72c
---
 .../gigi/pages/admin/support/SupportUserDetailsForm.java      | 1 +
 .../gigi/pages/admin/support/SupportUserDetailsForm.templ     | 2 +-
 .../gigi/pages/admin/support/SupportUserDetailsPage.java      | 4 +++-
 .../gigi/pages/admin/support/SupportUserDetailsPage.templ     | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index 16ece067..bf6f1488 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -92,6 +92,7 @@ public class SupportUserDetailsForm extends Form {
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         User user = this.user.getTargetUser();
         vars.put("mail", user.getEmail());
+        vars.put("status", l.getTranslation(user.isValidEmail(user.getEmail()) ? "verified" : "not verified"));
         vars.put("exNames", new ArrayIterable<Name>(user.getNames()) {
 
             @Override
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
index 06dbd042..08ea7597 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
@@ -4,7 +4,7 @@
         </tr>
         <tr>
             <td><?=_Email?>:</td>
-            <td><?=$mail?></td>
+            <td><?=$mail?><br/>(<?=$status?>)</td>
         </tr>
   <? foreach($exNames) { ?>
         <tr>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index 7ab65b32..fad39e90 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -49,9 +49,11 @@ public class SupportUserDetailsPage extends Page {
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
                 for (; i < addrs.length;) {
-                    String address = addrs[i++].getAddress();
+                    EmailAddress secAddress = addrs[i++];
+                    String address = secAddress.getAddress();
                     if ( !address.equals(user.getEmail())) {
                         vars.put("secmail", address);
+                        vars.put("status", l.getTranslation(secAddress.isVerified() ? "verified" : "not verified"));
                         return true;
                     }
                 }
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
index 667ff997..7b5b54e6 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
@@ -5,7 +5,7 @@
         </tr>
         <? foreach($emails) {?>
         <tr>
-            <td><?=$secmail?></td>
+            <td><?=$secmail?> (<?=$status?>)</td>
         </tr>
         <? } ?>
         </tbody>
-- 
2.39.2