diff --git a/scripts/pi-hole/js/db_lists.js b/scripts/pi-hole/js/db_lists.js index b91ce147..42104ee9 100644 --- a/scripts/pi-hole/js/db_lists.js +++ b/scripts/pi-hole/js/db_lists.js @@ -62,7 +62,7 @@ function updateTopClientsChart() { // Clear tables before filling them with data $("#client-frequency td").parent().remove(); var clienttable = $("#client-frequency").find("tbody:last"); - var client, percentage, clientname, clientip; + var client, percentage, clientname; var sum = 0; for (client in data.top_sources) { if (Object.prototype.hasOwnProperty.call(data.top_sources, client)){ @@ -84,17 +84,14 @@ function updateTopClientsChart() { { var idx = client.indexOf("|"); clientname = client.substr(0, idx); - clientip = client.substr(idx+1, client.length-idx); } else { clientname = client; - clientip = client; } - var url = clientname; percentage = data.top_sources[client] / sum * 100.0; - clienttable.append(" " + url + + clienttable.append(" " + clientname + " " + data.top_sources[client] + "
"); } diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js index 56078713..9791723f 100644 --- a/scripts/pi-hole/js/db_queries.js +++ b/scripts/pi-hole/js/db_queries.js @@ -231,59 +231,50 @@ $(document).ready(function() { tableApi = $("#all-queries").DataTable( { "rowCallback": function( row, data ){ - var blocked, fieldtext, buttontext, color; + var fieldtext, buttontext, color; switch (data[4]) { case 1: - blocked = true; color = "red"; fieldtext = "Blocked (gravity)"; buttontext = ""; break; case 2: - blocked = false; color = "green"; fieldtext = "OK (forwarded)"; buttontext = ""; break; case 3: - blocked = false; color = "green"; fieldtext = "OK (cached)"; buttontext = ""; break; case 4: - blocked = true; color = "red"; fieldtext = "Blocked (regex/wildcard)"; buttontext = ""; break; case 5: - blocked = true; color = "red"; fieldtext = "Blocked (blacklist)"; buttontext = ""; break; case 6: - blocked = true; color = "red"; fieldtext = "Blocked (external, IP)"; buttontext = ""; break; case 7: - blocked = true; color = "red"; fieldtext = "Blocked (external, NULL)"; buttontext = ""; break; case 8: - blocked = true; color = "red"; fieldtext = "Blocked (external, NXRA)"; buttontext = ""; break; default: - blocked = false; color = "black"; fieldtext = "Unknown"; buttontext = "";