From 84f6f3dae65327dd0af3761ef32ad953c179cf1e Mon Sep 17 00:00:00 2001
From: Michael Epstein <mepstein@mediabox.cl>
Date: Wed, 16 Jan 2019 00:08:44 -0300
Subject: [PATCH] - Fix the delete of blacklist/whitelist records under NGINX +
 PHP-FPM - Fix multiple php warning/error messages when this scripts are
 executed from AJAX requests

Example errors/warnings:

2019/01/15 13:22:22 [error] 1408#1408: *2535 FastCGI sent in stderr: "PHP message: PHP Notice:  Undefined variable: api in /var/www/html/admin/scripts/pi-hole/php/sub.php on line 16
PHP message: PHP Warning:  Cannot modify header information - headers already sent by (output started at /var/www/html/admin/scripts/pi-hole/php/sub.php:8) in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 81
PHP message: PHP Warning:  session_start(): Cannot start session when headers already sent in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 93

Signed-off-by: Michael Epstein <mepstein@mediabox.cl>
---
 scripts/pi-hole/php/add.php          | 3 ++-
 scripts/pi-hole/php/get.php          | 3 +--
 scripts/pi-hole/php/savesettings.php | 4 +---
 scripts/pi-hole/php/sub.php          | 5 ++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php
index d1d98ee7..d3ab2b4b 100644
--- a/scripts/pi-hole/php/add.php
+++ b/scripts/pi-hole/php/add.php
@@ -5,13 +5,14 @@
 *
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
+
 require_once('auth.php');
 
 $type = $_POST['list'];
 
 // Perform all of the verification for list editing
 // when NOT invoked and authenticated from API
-if (!$api) {
+if (empty($api)) {
     list_verify($type);
 }
 
diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php
index a14a3bb2..156622c7 100644
--- a/scripts/pi-hole/php/get.php
+++ b/scripts/pi-hole/php/get.php
@@ -4,9 +4,8 @@
 *  Network-wide ad blocking via your own hardware.
 *
 *  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */ ?>
+*  Please see LICENSE file for your rights under this license. */
 
-<?php
 if(!isset($_GET['list']))
     die("Missing parameter");
 
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index e96cc0b9..8b7389ec 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -4,9 +4,7 @@
 *  Network-wide ad blocking via your own hardware.
 *
 *  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */ ?>
-
-<?php
+*  Please see LICENSE file for your rights under this license. */
 
 if(basename($_SERVER['SCRIPT_FILENAME']) !== "settings.php")
 {
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index b2dc0c51..2edf8cf7 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -4,16 +4,15 @@
 *  Network-wide ad blocking via your own hardware.
 *
 *  This file is copyright under the latest version of the EUPL.
-*  Please see LICENSE file for your rights under this license. */ ?>
+*  Please see LICENSE file for your rights under this license. */
 
-<?php
 require_once('auth.php');
 
 $type = $_POST['list'];
 
 // Perform all of the verification for list editing
 // when NOT invoked and authenticated from API
-if (!$api) {
+if (empty($api)) {
     list_verify($type);
 }