Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-25 11:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1093 from pi-hole/rm-unused-vars

Browse Source 
Remove more unused variables
This commit is contained in:
DL6ER
2019-12-17 17:19:21 +01:00
committed by GitHub
parent 5828f0f866 8898a742d2
commit 549776011d
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/pi-hole/js/db_lists.js
View File

@@ -62,7 +62,7 @@ function updateTopClientsChart() {
// Clear tables before filling them with data // Clear tables before filling them with data
$("#client-frequency td").parent().remove(); $("#client-frequency td").parent().remove();
var clienttable = $("#client-frequency").find("tbody:last"); var clienttable = $("#client-frequency").find("tbody:last");
var client, percentage, clientname, clientip; var client, percentage, clientname;
var sum = 0; var sum = 0;
for (client in data.top_sources) { for (client in data.top_sources) {
if (Object.prototype.hasOwnProperty.call(data.top_sources, client)){ if (Object.prototype.hasOwnProperty.call(data.top_sources, client)){
@@ -84,17 +84,14 @@ function updateTopClientsChart() {
{ {
var idx = client.indexOf("|"); var idx = client.indexOf("|");
clientname = client.substr(0, idx); clientname = client.substr(0, idx);
clientip = client.substr(idx+1, client.length-idx);
} }
else else
{ {
clientname = client; clientname = client;
clientip = client;
} }
var url = clientname;
percentage = data.top_sources[client] / sum * 100.0; percentage = data.top_sources[client] / sum * 100.0;
clienttable.append("<tr> <td>" + url + clienttable.append("<tr> <td>" + clientname +
"</td> <td>" + data.top_sources[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + sum + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " + "</td> <td>" + data.top_sources[client] + "</td> <td> <div class=\"progress progress-sm\" title=\""+percentage.toFixed(1)+"% of " + sum + "\"> <div class=\"progress-bar progress-bar-blue\" style=\"width: " +
percentage + "%\"></div> </div> </td> </tr> "); percentage + "%\"></div> </div> </td> </tr> ");
} }

11
scripts/pi-hole/js/db_queries.js
View File

@@ -231,59 +231,50 @@ $(document).ready(function() {
tableApi = $("#all-queries").DataTable( { tableApi = $("#all-queries").DataTable( {
"rowCallback": function( row, data ){ "rowCallback": function( row, data ){
var blocked, fieldtext, buttontext, color; var fieldtext, buttontext, color;
switch (data[4]) switch (data[4])
{ {
case 1: case 1:
blocked = true;
color = "red"; color = "red";
fieldtext = "Blocked (gravity)"; fieldtext = "Blocked (gravity)";
buttontext = "<button class=\"text-green text-nowrap\"><i class=\"fas fa-check\"></i> Whitelist</button>"; buttontext = "<button class=\"text-green text-nowrap\"><i class=\"fas fa-check\"></i> Whitelist</button>";
break; break;
case 2: case 2:
blocked = false;
color = "green"; color = "green";
fieldtext = "OK <br class='hidden-lg'>(forwarded)"; fieldtext = "OK <br class='hidden-lg'>(forwarded)";
buttontext = "<button class=\"text-red text-nowrap\"><i class=\"fa fa-ban\"></i> Blacklist</button>"; buttontext = "<button class=\"text-red text-nowrap\"><i class=\"fa fa-ban\"></i> Blacklist</button>";
break; break;
case 3: case 3:
blocked = false;
color = "green"; color = "green";
fieldtext = "OK <br class='hidden-lg'>(cached)"; fieldtext = "OK <br class='hidden-lg'>(cached)";
buttontext = "<button class=\"text-red text-nowrap\"><i class=\"fa fa-ban\"></i> Blacklist</button>"; buttontext = "<button class=\"text-red text-nowrap\"><i class=\"fa fa-ban\"></i> Blacklist</button>";
break; break;
case 4: case 4:
blocked = true;
color = "red"; color = "red";
fieldtext = "Blocked <br class='hidden-lg'>(regex/wildcard)"; fieldtext = "Blocked <br class='hidden-lg'>(regex/wildcard)";
buttontext = "<button class=\"text-green text-nowrap\"><i class=\"fas fa-check\"></i> Whitelist</button>"; buttontext = "<button class=\"text-green text-nowrap\"><i class=\"fas fa-check\"></i> Whitelist</button>";
break; break;
case 5: case 5:
blocked = true;
color = "red"; color = "red";
fieldtext = "Blocked <br class='hidden-lg'>(blacklist)"; fieldtext = "Blocked <br class='hidden-lg'>(blacklist)";
buttontext = "<button class=\"text-green text-nowrap\"><i class=\"fas fa-check\"></i> Whitelist</button>"; buttontext = "<button class=\"text-green text-nowrap\"><i class=\"fas fa-check\"></i> Whitelist</button>";
break; break;
case 6: case 6:
blocked = true;
color = "red"; color = "red";
fieldtext = "Blocked <br class='hidden-lg'>(external, IP)"; fieldtext = "Blocked <br class='hidden-lg'>(external, IP)";
buttontext = ""; buttontext = "";
break; break;
case 7: case 7:
blocked = true;
color = "red"; color = "red";
fieldtext = "Blocked <br class='hidden-lg'>(external, NULL)"; fieldtext = "Blocked <br class='hidden-lg'>(external, NULL)";
buttontext = ""; buttontext = "";
break; break;
case 8: case 8:
blocked = true;
color = "red"; color = "red";
fieldtext = "Blocked <br class='hidden-lg'>(external, NXRA)"; fieldtext = "Blocked <br class='hidden-lg'>(external, NXRA)";
buttontext = ""; buttontext = "";
break; break;
default: default:
blocked = false;
color = "black"; color = "black";
fieldtext = "Unknown"; fieldtext = "Unknown";
buttontext = ""; buttontext = "";