pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test if white-/blacklist exist before trying to create a PHP file object

Browse Source
This commit is contained in:
DL6ER
2016-12-21 14:19:49 +01:00
parent fba3d10fa4
commit 82ae58fb0c
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/data.php
+31 -4
View File
@@ -5,8 +5,28 @@
$hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
$log = new \SplFileObject('/var/log/pihole.log');
$gravity = new \SplFileObject('/etc/pihole/list.preEventHorizon');
$whitelist = new \SplFileObject('/etc/pihole/whitelist.txt');
$blacklist = new \SplFileObject('/etc/pihole/blacklist.txt');
// whitelist.txt is optional and might not be there
$whiteListFile = "/etc/pihole/whitelist.txt";
if(file_exists($whiteListFile))
{
$whitelist = new \SplFileObject($whiteListFile);
}
else
{
$whitelist = new \SplFileObject("/dev/null");
}
// blacklist.txt is optional and might not be there
$blackListFile = "/etc/pihole/blacklist.txt";
if(file_exists($blacklistFile))
{
$blacklist = new \SplFileObject($blackListFile);
}
else
{
$blacklist = new \SplFileObject("/dev/null");
}
/******* Public Members ********/
function getSummaryData() {
@@ -239,8 +259,15 @@
/******** Private Members ********/
function gravityCount() {
$preEventHorizon = exec("grep -c ^ /etc/pihole/list.preEventHorizon");
$blacklist = exec("grep -c ^ /etc/pihole/blacklist.txt");
return ($preEventHorizon + $blacklist);
if(file_exists($blackListFile))
{
$blacklist = exec("grep -c ^ /etc/pihole/blacklist.txt");
return ($preEventHorizon + $blacklist);
}
else
{
return ($preEventHorizon);
}
}
function getDnsQueries(\SplFileObject $log) {