Merge pull request #262 from pi-hole/showPermittedshowBlocked

nothing to see here...
This commit is contained in:
DL6ER
2016-12-19 10:24:23 +01:00
committed by GitHub
+2 -1
View File
@@ -1,6 +1,7 @@
<?php
$log = array();
$setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
$hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
$log = new \SplFileObject('/var/log/pihole.log');
$gravity = new \SplFileObject('/etc/pihole/list.preEventHorizon');
@@ -144,7 +145,7 @@
function setShowBlockedPermitted()
{
global $showBlocked, $showPermitted;
global $showBlocked, $showPermitted, $setupVars;
if(isset($setupVars["API_QUERY_LOG_SHOW"]))
{
if($setupVars["API_QUERY_LOG_SHOW"] === "all")