From b7e9bd492c8abe5c9abfa817809b7e995ec46b06 Mon Sep 17 00:00:00 2001 From: Samu Voutilainen Date: Sun, 19 Jan 2020 13:29:39 +0200 Subject: [PATCH] Use piholeFTLConfig() to resolve pihole-FTL.conf contents Signed-off-by: Samu Voutilainen --- scripts/pi-hole/php/header.php | 12 ++---------- settings.php | 10 ++-------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 49b50361..971f961e 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -8,6 +8,7 @@ require "scripts/pi-hole/php/auth.php"; require "scripts/pi-hole/php/password.php"; + require_once "scripts/pi-hole/php/FTL.php"; $scriptname = basename($_SERVER['SCRIPT_FILENAME']); check_cors(); @@ -162,16 +163,7 @@ $FTLpid = intval(pidofFTL()); $FTL = ($FTLpid !== 0 ? true : false); - $piholeFTLConfFile = "/etc/pihole/pihole-FTL.conf"; - if(is_readable($piholeFTLConfFile)) - { - $piholeFTLConf = parse_ini_file($piholeFTLConfFile); - } - else - { - $piholeFTLConf = array(); - } - + $piholeFTLConf = piholeFTLConfig(); ?>