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

Implement necessary changes due to switching from individual to a common domainlist.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-12-08 17:42:01 +00:00
parent a9852b8762
commit 3a0a596b11
5 changed files with 131 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,13 +17,14 @@ require("database.php");
$GRAVITYDB = getGravityDBFilename();
$db = SQLite3_connect($GRAVITYDB);
function getTableContent($listname) {
function getTableContent($type) {
global $db;
$entries = array();
$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",
$querystr = implode(" ",array("SELECT domainlist.*,\"group\".enabled as group_enabled",
"FROM domainlist",
"LEFT JOIN domainlist_by_group ON domainlist_by_group.domainlist_id = domainlist.id",
"LEFT JOIN \"group\" ON \"group\".id = domainlist_by_group.group_id",
"WHERE type = $type",
"GROUP BY domain;"));
$results = $db->query($querystr);
@@ -32,7 +33,7 @@ function getTableContent($listname) {
array_push($entries, $res);
}
return array($listname => $entries);
return $entries;
}
function filterArray(&$inArray) {
@@ -54,14 +55,14 @@ function filterArray(&$inArray) {
switch ($listtype)
{
case "white":
$exact = getTableContent("whitelist");
$regex = getTableContent("regex_whitelist");
$exact = array("whitelist" => getTableContent(0));
$regex = array("regex_whitelist" => getTableContent(2));
$list = array_merge($exact, $regex);
break;
case "black":
$exact = getTableContent("blacklist");
$regex = getTableContent("regex_blacklist");
$exact = array("blacklist" => getTableContent(1));
$regex = array("regex_blacklist" => getTableContent(3));
$list = array_merge($exact, $regex);
break;