Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-26 13:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #968 from pi-hole/new/domain_groups_enabled_status

Browse Source 
Lists: Highlight if domains are disabled
This commit is contained in:
Mark Drobnak
2019-07-07 17:18:42 -04:00
committed by GitHub
parent f18e287150 eeb4598925
commit 77845474d8
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/pi-hole/js/list.js
View File

@@ -14,8 +14,17 @@ var fullName = listType === "white" ? "Whitelist" : "Blacklist";
function addListEntry(entry, index, list, button, type)
{
var used = entry.enabled === "1" ? "used" : "not-used";
var disabled = [];
if(entry.enabled === "0")
disabled.push("individual");
// For entry.group_enabled we either get "0" (= disabled by a group),
// "1" (= enabled by a group), or "" (= not managed by a group)
if(entry.group_enabled === "0")
disabled.push("group");
var used = disabled.length === 0 ? "used" : "not-used";
var comment = entry.comment.length > 0 ? " - " + entry.comment : "";
var disabled_message = disabled.length > 0 ? " - disabled due to " + disabled.join(" + ") + " setting" : "";
var date_added = new Date(parseInt(entry.date_added)*1000);
var date_modified = new Date(parseInt(entry.date_modified)*1000);
var tooltip = "Added: " + date_added.toLocaleString() +
@@ -23,7 +32,7 @@ function addListEntry(entry, index, list, button, type)
list.append(
"<li id=\"" + index + "\" class=\"list-group-item " + used + " clearfix\">" +
"<span title=\"" + tooltip + "\" data-toggle=\"tooltip\" data-placement=\"right\">" +
entry.domain + comment + "</span>" +
entry.domain + comment + disabled_message + "</span>" +
"<button class=\"btn btn-danger btn-xs pull-right\" type=\"button\">" +
"<span class=\"glyphicon glyphicon-trash\"></span></button></li>"
);

7
scripts/pi-hole/php/get.php
View File

@@ -20,7 +20,12 @@ $db = SQLite3_connect($GRAVITYDB);
function getTableContent($listname) {
global $db;
$entries = array();
$results = $db->query("SELECT * FROM $listname");
$querystr = implode(" ",array("SELECT ${listname}.*,\"group\".enabled as group_enabled",
"FROM $listname",
"LEFT JOIN ${listname}_by_group ON ${listname}_by_group.${listname}_id = ${listname}.id",
"LEFT JOIN \"group\" ON \"group\".id = ${listname}_by_group.group_id",
"GROUP BY domain;"));
$results = $db->query($querystr);
while($results !== false && $res = $results->fetchArray(SQLITE3_ASSOC))
{