Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 10:50:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Group assignment has changed in the database. Adapt the code accordignly.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-07-05 11:24:22 +02:00
parent 5f28a3816d
commit 4cc54ee407
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,14 +20,18 @@ $db = SQLite3_connect($GRAVITYDB);
function getTableContent($listname) {
global $db;
$entries = array();
$results = $db->query("SELECT a.*,b.enabled AS group_enabled FROM $listname a INNER JOIN domain_groups b ON b.id = a.group_id");
$querystr = implode(" ",array("SELECT DISTINCT ${listname}.*,\"group\".enabled as group_enabled",
"FROM $listname",
"LEFT JOIN ${listname}_by_group ON ${listname}_by_group.whitelist_id = ${listname}.id",
"LEFT JOIN \"group\" ON \"group\".id = ${listname}_by_group.group_id;"));
$results = $db->query($querystr);
while($results !== false && $res = $results->fetchArray(SQLITE3_ASSOC))
{
array_push($entries, $res);
}
return array($listname => $entries);
return array($listname => $entries, "querystring" => $querystr);
}
function filterArray(&$inArray) {