Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-25 05:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use piholeFTLConfig() to resolve pihole-FTL.conf contents

Browse Source 
Signed-off-by: Samu Voutilainen <smar@smar.fi>
This commit is contained in:
Samu Voutilainen
2020-01-19 13:29:39 +02:00
parent e70b9305bb
commit b7e9bd492c
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/pi-hole/php/header.php
View File

@@ -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();
?>
<!doctype html>
<!-- Pi-hole: A black hole for Internet advertisements

10
settings.php
View File

@@ -7,16 +7,10 @@
* Please see LICENSE file for your rights under this license. */
require "scripts/pi-hole/php/header.php";
require "scripts/pi-hole/php/savesettings.php";
require_once "scripts/pi-hole/php/FTL.php";
// Reread ini file as things might have been changed
$setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
if(is_readable($piholeFTLConfFile))
{
$piholeFTLConf = parse_ini_file($piholeFTLConfFile);
}
else
{
$piholeFTLConf = array();
}
$piholeFTLConf = piholeFTLConfig();
// Handling of PHP internal errors
$last_error = error_get_last();