diff --git a/queries.php b/queries.php index f511f8d1..705a22d6 100644 --- a/queries.php +++ b/queries.php @@ -119,6 +119,7 @@ if(strlen($showing) > 0) Domain Client Status + DNSSEC Action @@ -129,6 +130,7 @@ if(strlen($showing) > 0) Domain Client Status + DNSSEC Action diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index 984215bc..246c20bf 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -135,37 +135,56 @@ $(document).ready(function() { { $(row).css("color","red"); $("td:eq(4)", row).html( "Pi-holed" ); - $("td:eq(5)", row).html( "" ); + $("td:eq(6)", row).html( "" ); } else if (data[4] === "2") { $(row).css("color","green"); $("td:eq(4)", row).html( "OK (forwarded)" ); - $("td:eq(5)", row).html( "" ); + $("td:eq(6)", row).html( "" ); } else if (data[4] === "3") { $(row).css("color","green"); $("td:eq(4)", row).html( "OK (cached)" ); - $("td:eq(5)", row).html( "" ); + $("td:eq(6)", row).html( "" ); } else if (data[4] === "4") { $(row).css("color","red"); $("td:eq(4)", row).html( "Pi-holed (wildcard)" ); - $("td:eq(5)", row).html( "" ); + $("td:eq(6)", row).html( "" ); } else if (data[4] === "5") { $(row).css("color","red"); $("td:eq(4)", row).html( "Pi-holed (blacklist)" ); - $("td:eq(5)", row).html( "" ); + $("td:eq(6)", row).html( "" ); } else { $("td:eq(4)", row).html( "Unknown" ); - $("td:eq(5)", row).html( "" ); + $("td:eq(6)", row).html( "" ); + } + if (data[5] === "1") + { + $("td:eq(5)", row).css("color","green"); + $("td:eq(5)", row).html( "SECURE" ); + } + else if (data[5] === "2") + { + $("td:eq(5)", row).css("color","orange"); + $("td:eq(5)", row).html( "INSECURE" ); + } + else if (data[5] === "5") + { + $("td:eq(5)", row).css("color","red"); + $("td:eq(5)", row).html( "BOGUS" ); + } + else + { + $("td:eq(5)", row).html( "-" ); } }, dom: "<'row'<'col-sm-12'f>>" + @@ -179,9 +198,10 @@ $(document).ready(function() { "columns": [ { "width" : "20%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD HH:mm:ss z");}else{return data;} }}, { "width" : "10%" }, - { "width" : "40%", "render": $.fn.dataTable.render.text() }, - { "width" : "10%", "render": $.fn.dataTable.render.text() }, + { "width" : "37%", "render": $.fn.dataTable.render.text() }, + { "width" : "8%", "render": $.fn.dataTable.render.text() }, { "width" : "10%" }, + { "width" : "5%" }, { "width" : "10%" }, ], "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],