From f8e749392572e8035ef32191347dc7b67684edfe Mon Sep 17 00:00:00 2001
From: Mark Schouten <mark@tuxis.nl>
Date: Tue, 10 Jun 2014 11:27:12 +0200
Subject: [PATCH] Also fix new index.php and zones.php ...

---
 index.php | 27 ++++++++++++++++++++++++++-
 zones.php | 12 +++++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/index.php b/index.php
index f6c100c..deee67c 100644
--- a/index.php
+++ b/index.php
@@ -100,6 +100,8 @@ if (isset($templatelist)) {
 ?>
 <body>
 <div id="wrap">
+    <div id="dnssecinfo">
+    </div>
     <div id="menu" class="jtable-main-container">
         <div class="jtable-title">
             <div class="jtable-title-text">
@@ -306,7 +308,30 @@ $(document).ready(function () {
             dnssec: {
                 title: 'DNSSEC',
                 display: function (zone) {
-                    console.log(zone);
+            if (zone.record.dnssec == true) {
+                var $img = $('<img class="list" src="img/lock.png" title="DNSSec Info" />');
+                $img.click(function () {
+                    $("#dnssecinfo").html("");
+                    $.each(zone.record.keyinfo, function ( i, val) {
+                        if (val.dstxt) {
+                            $("#dnssecinfo").append("<p><h2>"+val.keytype+"</h2><pre>"+val.dstxt+"</pre></p>");
+                        }
+                    });
+                    $("#dnssecinfo").dialog({
+                        modal: true,
+                        title: "DS-records for "+zone.record.name,
+                        width: 'auto',
+                        buttons: {
+                            Ok: function() {
+                                $( this ).dialog( "close" );
+                            }
+                        }
+                    });
+                });
+                return $img;
+            } else {
+               return '<img src="img/lock_open.png" title="DNSSec Disabled" />';
+             }
                 }
             },
             <? if (is_adminuser()) { ?>
diff --git a/zones.php b/zones.php
index 92ee1cd..6607feb 100644
--- a/zones.php
+++ b/zones.php
@@ -133,10 +133,12 @@ function get_zone_keys($zone) {
         if (!isset($key['active']))
             continue;
 
-        if (isset($key['dses'])) {
-            $key['dstxt'] = join("\n", $key['dses']);
+        if (isset($key['ds'])) {
+            foreach ($key['ds'] as $ds) {
+                $key['dstxt'] .= $zone.' IN DS '.$ds."\n";
+            }
         }
-        unset($key['dses']);
+        unset($key['ds']);
         $ret[] = $key;
     }
 
@@ -173,8 +175,8 @@ if ($action == "list" or $action== "listslaves") {
         if ($action == "listslaves" and $zone['kind'] == "Slave") {
             array_push($return, $zone);
         } elseif ($action == "list" and $zone['kind'] != "Slave") {
-            if ($zone['dnssec'] === TRUE) {
-                $zone['keyinfo'] = get_zone_keys($zone);
+            if ($zone['dnssec'] == true) {
+                $zone['keyinfo'] = get_zone_keys($zone['name']);
             }
             array_push($return, $zone);
         }
