From 6457124fbfc81ab82fb0e8a533ad930d991dbf64 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sun, 24 Aug 2014 09:50:57 +0200
Subject: [PATCH] UPD: show the "verified"-status primitive-like for domains.

---
 doc/tableStructure.sql                               |  2 +-
 src/org/cacert/gigi/Domain.java                      | 12 ++++++++++++
 .../gigi/pages/account/DomainManagementForm.java     |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/tableStructure.sql b/doc/tableStructure.sql
index 2d5fa6c3..cc47b41a 100644
--- a/doc/tableStructure.sql
+++ b/doc/tableStructure.sql
@@ -87,7 +87,7 @@ CREATE TABLE `domainPinglog` (
   `when` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `configId` int(13) NOT NULL,
   `state` enum('open', 'success', 'failed') NOT NULL,
-  `challenge` varchar(16) NOT NULL,
+  `challenge` varchar(16),
   `result` varchar(255)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
diff --git a/src/org/cacert/gigi/Domain.java b/src/org/cacert/gigi/Domain.java
index 3eb628aa..bcc66beb 100644
--- a/src/org/cacert/gigi/Domain.java
+++ b/src/org/cacert/gigi/Domain.java
@@ -126,4 +126,16 @@ public class Domain {
             throw new GigiApiException(e);
         }
     }
+
+    public boolean isVerified() {
+        try {
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT 1 FROM domainPinglog INNER JOIN pingconfig ON pingconfig.id=domainPinglog.configId WHERE domainid=? AND state='success'");
+            ps.setInt(1, id);
+            ResultSet rs = ps.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
 }
diff --git a/src/org/cacert/gigi/pages/account/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/DomainManagementForm.java
index 1ffa33d3..5df57114 100644
--- a/src/org/cacert/gigi/pages/account/DomainManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/DomainManagementForm.java
@@ -61,7 +61,7 @@ public class DomainManagementForm extends Form {
                 Domain domain = doms[point];
                 vars.put("id", domain.getId());
                 vars.put("domain", domain.getSuffix());
-                vars.put("status", "??");
+                vars.put("status", l.getTranslation(domain.isVerified() ? "verified" : "not verified"));
                 point++;
                 return true;
             }
-- 
2.39.2