From d7fdaf9273ad0a3f352bc62d8532330c56b915aa Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sun, 19 Feb 2017 21:19:02 +0100
Subject: [PATCH 1/4] Fix whitespace caused by added license headers

---
 api.php                          | 7 ++++---
 scripts/pi-hole/php/auth.php     | 3 +--
 scripts/pi-hole/php/data.php     | 3 +--
 scripts/pi-hole/php/func.php     | 4 +---
 scripts/pi-hole/php/password.php | 3 +--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/api.php b/api.php
index a9aaa3b2..44fe3a21 100644
--- a/api.php
+++ b/api.php
@@ -1,10 +1,11 @@
-<!-- Pi-hole: A black hole for Internet advertisements
+<?php
+/* Pi-hole: A black hole for Internet advertisements
 *    (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 *    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. */
+
     $api = true;
     require "scripts/pi-hole/php/password.php";
     require "scripts/pi-hole/php/auth.php";
diff --git a/scripts/pi-hole/php/auth.php b/scripts/pi-hole/php/auth.php
index b1c22aea..77871e4d 100644
--- a/scripts/pi-hole/php/auth.php
+++ b/scripts/pi-hole/php/auth.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
 require('func.php');
 $ERRORLOG = getenv('PHP_ERROR_LOG');
 if (empty($ERRORLOG)) {
diff --git a/scripts/pi-hole/php/data.php b/scripts/pi-hole/php/data.php
index 289d3131..f7226698 100644
--- a/scripts/pi-hole/php/data.php
+++ b/scripts/pi-hole/php/data.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
     $log = array();
     $setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
 
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index 57f61f08..4453d99d 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.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. */
 
 function is_valid_domain_name($domain_name)
 {
diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index af9716bf..40095563 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.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
     // Start a new PHP session (or continue an existing one)
     session_start();
 

From 94539d3952a8d4b05bc8dbc6e01ba4a0e6097bf9 Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Mon, 20 Feb 2017 21:41:55 +0000
Subject: [PATCH 2/4] whitespace in licence header causing issues with query
 adlists page

---
 scripts/pi-hole/php/queryads.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/pi-hole/php/queryads.php b/scripts/pi-hole/php/queryads.php
index 4d7fbc45..95697979 100644
--- a/scripts/pi-hole/php/queryads.php
+++ b/scripts/pi-hole/php/queryads.php
@@ -5,7 +5,6 @@
 *
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */ ?>
-
 <?php
 ob_end_flush();
 ini_set("output_buffering", "0");

From 81ed75eb848777ff9b089a579b18b16cb23b846c Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Mon, 20 Feb 2017 21:43:37 +0000
Subject: [PATCH 3/4] same thing on gravity.sh.php

---
 scripts/pi-hole/php/gravity.sh.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/pi-hole/php/gravity.sh.php b/scripts/pi-hole/php/gravity.sh.php
index e508625e..0d1864bb 100644
--- a/scripts/pi-hole/php/gravity.sh.php
+++ b/scripts/pi-hole/php/gravity.sh.php
@@ -5,7 +5,6 @@
 *
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */ ?>
-
 <?php
 require "password.php";
 if(!$auth) die("Not authorized");

From d1ed5652a8612adc7220204f20ec461e7c850e06 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 20 Feb 2017 23:11:38 +0100
Subject: [PATCH 4/4] Another small change to ensure the remining line endings
 are also gone

---
 scripts/pi-hole/php/gravity.sh.php | 4 ++--
 scripts/pi-hole/php/queryads.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/php/gravity.sh.php b/scripts/pi-hole/php/gravity.sh.php
index 0d1864bb..9819064f 100644
--- a/scripts/pi-hole/php/gravity.sh.php
+++ b/scripts/pi-hole/php/gravity.sh.php
@@ -4,8 +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. */ ?>
-<?php
+*  Please see LICENSE file for your rights under this license. */
+
 require "password.php";
 if(!$auth) die("Not authorized");
 
diff --git a/scripts/pi-hole/php/queryads.php b/scripts/pi-hole/php/queryads.php
index 95697979..457e235c 100644
--- a/scripts/pi-hole/php/queryads.php
+++ b/scripts/pi-hole/php/queryads.php
@@ -4,8 +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. */ ?>
-<?php
+*  Please see LICENSE file for your rights under this license. */
+
 ob_end_flush();
 ini_set("output_buffering", "0");
 ob_implicit_flush(true);