Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Be able to exclude certain domains / clients #232

Merged
merged 4 commits into from Dec 11, 2016
Merged

Be able to exclude certain domains / clients #232

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57e814a
Added function excludeDomainsfromList($array)
DL6ER Dec 9, 2016
5e61c9c
Generalized function
DL6ER Dec 9, 2016
158704d
Extended to Top Clients
DL6ER Dec 9, 2016
0ac0671
Renamed variables since they do not only affect the webUI but the who…
DL6ER Dec 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 29 additions & 1 deletion data.php
View file
Open in desktop
@@ -1,6 +1,7 @@
<?php
$log = array();
$divide = parse_ini_file("/etc/pihole/setupVars.conf")['IPV6_ADDRESS'] != "" && parse_ini_file("/etc/pihole/setupVars.conf")['IPV4_ADDRESS'] != "";
$setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
$divide = $setupVars['IPV6_ADDRESS'] != "" && $setupVars['IPV4_ADDRESS'] != "";
$hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
$log = new \SplFileObject('/var/log/pihole.log');

Expand Down Expand Up @@ -125,6 +126,13 @@ function getQuerySources() {
$sources[$ip] = 1;
}
}

global $setupVars;
if(isset($setupVars["API_EXCLUDE_CLIENTS"]))
{
$sources = excludeFromList($sources, "API_EXCLUDE_CLIENTS");
}

arsort($sources);
$sources = array_slice($sources, 0, 10);
return Array(
Expand Down Expand Up @@ -254,10 +262,30 @@ function topItems($queries, $exclude = array(), $qty=10) {
}
}
}

global $setupVars;
if(isset($setupVars["API_EXCLUDE_DOMAINS"]))
{
$splitQueries = excludeFromList($splitQueries, "API_EXCLUDE_DOMAINS");
}

arsort($splitQueries);
return array_slice($splitQueries, 0, $qty);
}

function excludeFromList($array,$key)
{
global $setupVars;
$domains = explode(",",$setupVars[$key]);
foreach ($domains as $domain) {
if(isset($array[$domain]))
{
unset($array[$domain]);
}
}
return $array;
}

function overTime($entries) {
$byTime = array();
foreach ($entries as $entry) {
Expand Down