From af0b405cd64bb58d990917a0e60f2e03366e0635 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 15 Dec 2016 17:36:26 +0100 Subject: [PATCH 001/132] Enable/disable all lists from /etc/pihole/adlists.default from the Settings page --- php/savesettings.php | 46 ++++++++++++++++++++++++++++++++++++++++++++ settings.php | 22 +++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/php/savesettings.php b/php/savesettings.php index 7460305c..31fda2ed 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -34,6 +34,34 @@ function validDomain($domain_name) "8.20.247.20" => "Comodo" ]; +$adlists = []; +function readAdlists() +{ + global $adlists; + $adlists = []; + $handle = fopen("/etc/pihole/adlists.default", "r"); + if ($handle) + { + while (($line = fgets($handle)) !== false) + { + if(substr($line, 0, 2) === "#h") + { + // Commented list + array_push($adlists, [false,rtrim(substr($line, 1))]); + } + elseif(substr($line, 0, 1) === "h") + { + // Active list + array_push($adlists, [true,rtrim($line)]); + } + } + fclose($handle); + } +} + + // Read available adlists + readAdlists(); + if(isset($_POST["field"])) { $error = ""; @@ -294,6 +322,24 @@ function validDomain($domain_name) break; + case "adlists": + foreach ($adlists as $key => $value) + { + if(isset($_POST["adlist-".$key])) + { + $action = "enable"; + } + else + { + $action = "disable"; + } + exec("sudo pihole -a adlist ".$action." ".escapeshellcmd ($value[1])); + } + + // Reread available adlists + readAdlists(); + break; + default: // Option not found $debug = true; diff --git a/settings.php b/settings.php index 2743bc71..1f85cf0d 100644 --- a/settings.php +++ b/settings.php @@ -477,6 +477,28 @@ */ ?> +
+
+

Pi-Hole's Block Lists

+
+
+
+
+
+ $value) { ?> +
+
+
+ +
+
+
+ + + +
+
+

System Administration

From 51f1bfe1755a9c3f3c1f28daabf1d6baa32736a1 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 13:47:18 +0100 Subject: [PATCH 002/132] Generalized the functions to allow different ad files to be loaded --- php/savesettings.php | 22 ++++++++++++---------- settings.php | 9 ++++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index 6406f2da..821cc0b9 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -34,12 +34,13 @@ function validDomain($domain_name) "8.20.247.20" => "Comodo" ]; -$adlists = []; -function readAdlists() +$adlistsdefault = []; +$adlistsuser = []; +function readAdlists(&$list, $listname) { - global $adlists; - $adlists = []; - $handle = fopen("/etc/pihole/adlists.default", "r"); + // Reset list + $list = []; + $handle = @fopen("/etc/pihole/adlists.".$listname, "r"); if ($handle) { while (($line = fgets($handle)) !== false) @@ -47,12 +48,12 @@ function readAdlists() if(substr($line, 0, 2) === "#h") { // Commented list - array_push($adlists, [false,rtrim(substr($line, 1))]); + array_push($list, [false,rtrim(substr($line, 1))]); } elseif(substr($line, 0, 1) === "h") { // Active list - array_push($adlists, [true,rtrim($line)]); + array_push($list, [true,rtrim($line)]); } } fclose($handle); @@ -60,7 +61,8 @@ function readAdlists() } // Read available adlists - readAdlists(); + readAdlists($adlistsdefault,"default"); + readAdlists($adlistsuser,"user"); $error = ""; $success = ""; @@ -324,7 +326,7 @@ function readAdlists() break; case "adlists": - foreach ($adlists as $key => $value) + foreach ($adlistsdefault as $key => $value) { if(isset($_POST["adlist-".$key])) { @@ -338,7 +340,7 @@ function readAdlists() } // Reread available adlists - readAdlists(); + readAdlists($adlistsdefault,"default"); break; default: diff --git a/settings.php b/settings.php index e903054e..1377f0fe 100644 --- a/settings.php +++ b/settings.php @@ -485,7 +485,14 @@
- $value) { ?> + + $value) { ?> +
+
+
+ + + $value) { ?>
From 7b87301e7ce6ae879cb1408c606fc8da48d1e8d0 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 15:16:14 +0100 Subject: [PATCH 003/132] Be able to add lists to the user-defined list + tell the user that the list maintained by us will be reset on every update --- php/savesettings.php | 10 ++++++++++ settings.php | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index 821cc0b9..343befe6 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -339,8 +339,18 @@ function readAdlists(&$list, $listname) exec("sudo pihole -a adlist ".$action." ".escapeshellcmd ($value[1])); } + if(strlen($_POST["newuserlists"]) > 1) + { + $domains = array_filter(preg_split('/\r\n|[\r\n]/', $_POST["newuserlists"])); + foreach($domains as $domain) + { + exec("sudo pihole -a adlist adduser ".escapeshellcmd($domain)); + } + } + // Reread available adlists readAdlists($adlistsdefault,"default"); + readAdlists($adlistsuser,"user"); break; default: diff --git a/settings.php b/settings.php index 1377f0fe..3e451985 100644 --- a/settings.php +++ b/settings.php @@ -9,7 +9,7 @@ @@ -485,7 +485,7 @@
- + $value) { ?>
@@ -497,6 +497,9 @@
+
+ +
From 6e7020a8bada66de299bfd84f8fcbcbeaed54829 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 15:22:58 +0100 Subject: [PATCH 004/132] Only enable/disable those lists where the status should be changed (efficiency + speed) --- php/savesettings.php | 12 +++++++----- settings.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index 343befe6..f74a1639 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -328,15 +328,17 @@ function readAdlists(&$list, $listname) case "adlists": foreach ($adlistsdefault as $key => $value) { - if(isset($_POST["adlist-".$key])) + if(isset($_POST["adlist-".$key]) && !$value[0]) { - $action = "enable"; + // Is not enabled, but should be + exec("sudo pihole -a adlist enable ".escapeshellcmd ($value[1])); + } - else + elseif(!isset($_POST["adlist-".$key]) && $value[0]) { - $action = "disable"; + // Is enabled, but shouldn't be + exec("sudo pihole -a adlist disable ".escapeshellcmd ($value[1])); } - exec("sudo pihole -a adlist ".$action." ".escapeshellcmd ($value[1])); } if(strlen($_POST["newuserlists"]) > 1) diff --git a/settings.php b/settings.php index 3e451985..d049503e 100644 --- a/settings.php +++ b/settings.php @@ -494,7 +494,7 @@ $value) { ?>
-
+
From c73c10f8a01e7de46b627faef09d2d1513400b7d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 15:33:16 +0100 Subject: [PATCH 005/132] Be able to enable/disable user lists and add multiple user lists at a time (one URL per line) --- php/savesettings.php | 20 +++++++++++++++++--- settings.php | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index f74a1639..3eca95bb 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -331,13 +331,27 @@ function readAdlists(&$list, $listname) if(isset($_POST["adlist-".$key]) && !$value[0]) { // Is not enabled, but should be - exec("sudo pihole -a adlist enable ".escapeshellcmd ($value[1])); + exec("sudo pihole -a adlist enable default ".escapeshellcmd ($value[1])); } elseif(!isset($_POST["adlist-".$key]) && $value[0]) { // Is enabled, but shouldn't be - exec("sudo pihole -a adlist disable ".escapeshellcmd ($value[1])); + exec("sudo pihole -a adlist disable default ".escapeshellcmd ($value[1])); + } + } + foreach ($adlistsuser as $key => $value) + { + if(isset($_POST["userlist-".$key]) && !$value[0]) + { + // Is not enabled, but should be + exec("sudo pihole -a adlist enable user ".escapeshellcmd ($value[1])); + + } + elseif(!isset($_POST["userlist-".$key]) && $value[0]) + { + // Is enabled, but shouldn't be + exec("sudo pihole -a adlist disable user ".escapeshellcmd ($value[1])); } } @@ -346,7 +360,7 @@ function readAdlists(&$list, $listname) $domains = array_filter(preg_split('/\r\n|[\r\n]/', $_POST["newuserlists"])); foreach($domains as $domain) { - exec("sudo pihole -a adlist adduser ".escapeshellcmd($domain)); + exec("sudo pihole -a adlist add user ".escapeshellcmd($domain)); } } diff --git a/settings.php b/settings.php index d049503e..e76ebd50 100644 --- a/settings.php +++ b/settings.php @@ -491,7 +491,7 @@
- + $value) { ?>
From 3e8e153cfdb1d933fbbbee6846c221316035df85 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 27 Dec 2016 20:04:31 +0000 Subject: [PATCH 006/132] Add notice on whitelist page that list domains are automatically added --- list.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/list.php b/list.php index e38891b4..8bf0ce11 100644 --- a/list.php +++ b/list.php @@ -24,6 +24,7 @@ function getFullName() {

+

Note that the ad list domains are automatically added to the whitelist so that a list can never get blocked by another list.

@@ -48,6 +49,7 @@ function getFullName() { Failure! Something went wrong.
+
    From c9f9d5f8d7d9ddef02806325b404c7ff24e6b479 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 27 Dec 2016 20:09:44 +0000 Subject: [PATCH 007/132] Add shortcut to Update lists (since it is now hidden under Tools) --- settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.php b/settings.php index 45b00439..446363a2 100644 --- a/settings.php +++ b/settings.php @@ -549,7 +549,7 @@
    - +
    From f577045a43f3fb52d2e53cc34231f78f857c8f88 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 28 Dec 2016 13:58:12 +0000 Subject: [PATCH 008/132] Change from "h" to "http" --- php/savesettings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index ded7f3fd..36c4894a 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -59,12 +59,12 @@ function readAdlists(&$list, $listname) { while (($line = fgets($handle)) !== false) { - if(substr($line, 0, 2) === "#h") + if(substr($line, 0, 2) === "#http") { // Commented list array_push($list, [false,rtrim(substr($line, 1))]); } - elseif(substr($line, 0, 1) === "h") + elseif(substr($line, 0, 1) === "http") { // Active list array_push($list, [true,rtrim($line)]); From 1b77e75a216871de4deb3c14c6974fe41d4a1557 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 28 Dec 2016 14:06:31 +0000 Subject: [PATCH 009/132] Return lists instead of replacing them inline --- php/savesettings.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/php/savesettings.php b/php/savesettings.php index 36c4894a..a35d11a9 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -50,7 +50,7 @@ function validDomain($domain_name) $adlistsdefault = []; $adlistsuser = []; -function readAdlists(&$list, $listname) +function readAdlists($listname) { // Reset list $list = []; @@ -59,12 +59,12 @@ function readAdlists(&$list, $listname) { while (($line = fgets($handle)) !== false) { - if(substr($line, 0, 2) === "#http") + if(substr($line, 0, 5) === "#http") { // Commented list array_push($list, [false,rtrim(substr($line, 1))]); } - elseif(substr($line, 0, 1) === "http") + elseif(substr($line, 0, 4) === "http") { // Active list array_push($list, [true,rtrim($line)]); @@ -72,11 +72,12 @@ function readAdlists(&$list, $listname) } fclose($handle); } + return $list; } // Read available adlists - readAdlists($adlistsdefault,"default"); - readAdlists($adlistsuser,"user"); + $adlistsdefault = readAdlists("default"); + $adlistsuser = readAdlists("user"); $error = ""; $success = ""; @@ -407,8 +408,8 @@ function readAdlists(&$list, $listname) } // Reread available adlists - readAdlists($adlistsdefault,"default"); - readAdlists($adlistsuser,"user"); + $adlistsdefault = readAdlists("default"); + $adlistsuser = readAdlists("user"); break; default: From 8414ddf115f072aac62c20bd09605bed4b2d37b2 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 31 Dec 2016 15:46:47 +0000 Subject: [PATCH 010/132] Changed wording --- settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.php b/settings.php index 40616af7..b8c3fa3b 100644 --- a/settings.php +++ b/settings.php @@ -542,7 +542,7 @@
    - + $value) { ?>
    From ffe40009f1e9c677cc17e6ca889ed620065ca99e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 2 Jan 2017 15:07:23 +0100 Subject: [PATCH 011/132] Add "Save and Update" button --- scripts/pi-hole/js/gravity.js | 14 ++++++++++++++ settings.php | 12 ++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/gravity.js b/scripts/pi-hole/js/gravity.js index a208cae1..1a00ee27 100644 --- a/scripts/pi-hole/js/gravity.js +++ b/scripts/pi-hole/js/gravity.js @@ -32,9 +32,23 @@ $("#gravityBtn").on("click", () => { eventsource(); }); +$("#gravityBtn").on("click", () => { + $("#gravityBtn").attr("disabled", true); + eventsource(); +}); + // Handle hiding of alerts $(function(){ $("[data-hide]").on("click", function(){ $(this).closest("." + $(this).attr("data-hide")).hide(); }); + + // Do we want to start updating immediately? + // gravity.php?go + var searchString = window.location.search.substring(1); + if(searchString.indexOf("go") !== -1) + { + $("#gravityBtn").attr("disabled", true); + eventsource(); + } }); diff --git a/settings.php b/settings.php index df41e59d..fd68e495 100644 --- a/settings.php +++ b/settings.php @@ -11,6 +11,14 @@ } + refresh to the gravity page and start updating immediately +?> + + +
    - - + +
    From 1b3904f67ee0ee96aa50b6a463053a66bef2aa7e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 14 Feb 2017 14:51:13 +0100 Subject: [PATCH 012/132] Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/ --- LICENSE | 179 +++++++++++++++++++++++++++++++++++++---- scripts/vendor/LICENSE | 20 +++++ style/vendor/LICENSE | 20 +++++ 3 files changed, 203 insertions(+), 16 deletions(-) create mode 100644 scripts/vendor/LICENSE create mode 100644 style/vendor/LICENSE diff --git a/LICENSE b/LICENSE index e1854e86..da85e8d6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,167 @@ -The MIT License (MIT) +Copyright (C) 2017 Pi-hole, LLC (https://pi-hole.net) +Pi-hole web interface -Copyright (c) 2014-2015 almasaeed2010 +This software is licensed under the European Union Public License -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +This license is available in the 22 official languages of the EU. The English version is included here. +Please see https://joinup.ec.europa.eu/community/eupl/og_page/eupl for official translations of the other languages. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +This license applies to the whole project EXCEPT the files under + - styles/vendor, and + - scripts/vendor +whose licenses are located therein. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------- + +European Union Public Licence +V. 1.1 + +EUPL (C) the European Community 2007 + +This European Union Public Licence (the "EUPL") applies to the Work or Software (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright holder of the Work). + +The Original Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the copyright notice for the Original Work: + +Licensed under the EUPL V.1.1 + +or has expressed by any other mean his willingness to license under the EUPL. + +1. Definitions + +In this Licence, the following terms have the following meaning: + +- The Licence: this Licence. + +- The Original Work or the Software: the software distributed and/or communicated by the Licensor under this Licence, available as Source Code and also as Executable Code as the case may be. + +- Derivative Works: the works or software that could be created by the Licensee, based upon the Original Work or modifications thereof. This Licence does not define the extent of modification or dependence on the Original Work required in order to classify a work as a Derivative Work; this extent is determined by copyright law applicable in the country mentioned in Article 15. + +- The Work: the Original Work and/or its Derivative Works. + +- The Source Code: the human-readable form of the Work which is the most convenient for people to study and modify. + +- The Executable Code: any code which has generally been compiled and which is meant to be interpreted by a computer as a program. + +- The Licensor: the natural or legal person that distributes and/or communicates the Work under the Licence. + +- Contributor(s): any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work. + +- The Licensee or "You": any natural or legal person who makes any usage of the Software under the terms of the Licence. + +- Distribution and/or Communication: any act of selling, giving, lending, renting, distributing, communicating, transmitting, or otherwise making available, on-line or off-line, copies of the Work or providing access to its essential functionalities at the disposal of any other natural or legal person. + +2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, sub-licensable licence to do the following, for the duration of copyright vested in the Original Work: + +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Original Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display the Work or copies thereof to the public and perform publicly, as the case may be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sub-license rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to exercise his moral right to the extent allowed by law in order to make effective the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non exclusive usage rights to any patents held by the Licensor, to the extent necessary to make use of the rights granted on the Work under this Licence. + +3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work along with each copy of the Work that the Licensor distributes or indicates, in a notice following the copyright notice attached to the Work, a repository where the Source Code is easily and freely accessible for as long as the Licensor continues to distribute and/or communicate the Work. + +4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from any exception or limitation to the exclusive rights of the rights owners in the Original Work or Software, of the exhaustion of those rights or of other applicable limitations thereto. + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: the Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to the Licence and to the disclaimer of warranties. The Licensee must include a copy of such notices and a copy of the Licence with every copy of the Work he/she distributes and/or communicates. The Licensee must cause any Derivative Work to carry prominent notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes and/or communicates copies of the Original Works or Derivative Works based upon the Original Work, this Distribution and/or Communication will be done under the terms of this Licence or of a later version of this Licence unless the Original Work is expressly distributed only under this version of the Licence. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the Work or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes and/or Communicates Derivative Works or copies thereof based upon both the Original Work and another work licensed under a Compatible Licence, this Distribution and/or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, "Compatible Licence" refers to the licences listed in the appendix attached to this Licence. Should the Licensee’s obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail. + +Provision of Source Code: When distributing and/or communicating copies of the Work, the Licensee will provide a machine-readable copy of the Source Code or indicate a repository where this Source will be easily and freely available for as long as the Licensee continues to distribute and/or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, trademarks, service marks, or names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the copyright notice. + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings to the Work are owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the terms of this Licence. + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous contributors. It is not a finished work and may therefore contain defects or "bugs" inherent to this type of software development. + +For the above reason, the Work is provided under the Licence on an "as is" basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property rights other than copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition for the grant of any rights to the Work. + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be liable for any direct or indirect, material or moral, damages of any kind, arising out of the Licence or of the use of the Work, including without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss of data or any commercial damage, even if the Licensor has been advised of the possibility of such damage. However, the Licensor will be liable under statutory product liability laws as far such laws apply to the Work. + +9. Additional agreements + +While distributing the Original Work or Derivative Works, You may choose to conclude an additional agreement to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or services consistent with this Licence. However, in accepting such obligations, You may act only on your own behalf and on your sole responsibility, not on behalf of the original Licensor or any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against such Contributor by the fact You have accepted any such warranty or additional liability. + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon "I agree" placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and conditions by exercising any rights granted to You by Article 2 of this Licence, such as the use of the Work, the creation by You of a Derivative Work or the Distribution and/or Communication by You of the Work or copies thereof. + +11. Information to the public + +In case of any Distribution and/or Communication of the Work by means of electronic communication by You (for example, by offering to download the Work from a remote location) the distribution channel or media (for example, a website) must at least provide to the public the information requested by the applicable law regarding the Licensor, the Licence and the way it may be accessible, concluded, stored and reproduced by the Licensee. + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has received the Work from the Licensee under the Licence, provided such persons remain in full compliance with the Licence. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the Work licensed hereunder. + +If any provision of the Licence is invalid or unenforceable under applicable law, this will not affect the validity or enforceability of the Licence as a whole. Such provision will be construed and/or reformed so as necessary to make it valid and enforceable. + +The European Commission may publish other linguistic versions and/or new versions of this Licence, so far this is required and reasonable, without reducing the scope of the rights granted by the Licence. New versions of the Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of their choice. + +14. Jurisdiction + +Any litigation resulting from the interpretation of this License, arising between the European Commission, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice of the European Communities, as laid down in article 238 of the Treaty establishing the European Community. + +Any litigation arising between Parties, other than the European Commission, and resulting from the interpretation of this License, will be subject to the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business. + +15. Applicable Law + +This Licence shall be governed by the law of the European Union country where the Licensor resides or has his registered office. + +This licence shall be governed by the Belgian law if: + +- a litigation arises between the European Commission, as a Licensor, and any Licensee; +- the Licensor, other than the European Commission, has no residence or registered office inside a European Union country. + + +=== +Appendix + +"Compatible Licences" according to article 5 EUPL are: +- GNU General Public License (GNU GPL) v. 2 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Common Public License v. 1.0 +- Eclipse Public License v. 1.0 +- Cecill v. 2.0 diff --git a/scripts/vendor/LICENSE b/scripts/vendor/LICENSE new file mode 100644 index 00000000..e1854e86 --- /dev/null +++ b/scripts/vendor/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014-2015 almasaeed2010 + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/style/vendor/LICENSE b/style/vendor/LICENSE new file mode 100644 index 00000000..e1854e86 --- /dev/null +++ b/style/vendor/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014-2015 almasaeed2010 + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 9b799819bff49cda5dcd3d2534d7fa25a4568170 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 14 Feb 2017 14:57:58 +0100 Subject: [PATCH 013/132] Added header to main PHP files --- api.php | 6 ++++++ gravity.php | 6 ++++++ help.php | 6 ++++++ index.php | 6 ++++++ list.php | 6 ++++++ queries.php | 6 ++++++ queryads.php | 6 ++++++ settings.php | 6 ++++++ taillog.php | 6 ++++++ 9 files changed, 54 insertions(+) diff --git a/api.php b/api.php index 589ae0bd..a9aaa3b2 100644 --- a/api.php +++ b/api.php @@ -1,3 +1,9 @@ + diff --git a/help.php b/help.php index 6f19ad60..e4960973 100644 --- a/help.php +++ b/help.php @@ -1,3 +1,9 @@ + diff --git a/settings.php b/settings.php index d746d952..01172d50 100644 --- a/settings.php +++ b/settings.php @@ -1,3 +1,9 @@ + From 1c73016f6a4bee9e546a9fb2cea43c47c950401b Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 14 Feb 2017 15:00:11 +0100 Subject: [PATCH 014/132] Modified scripts in scripts/pi-hole/php --- scripts/pi-hole/php/add.php | 8 ++++++++ scripts/pi-hole/php/auth.php | 8 ++++++++ scripts/pi-hole/php/data.php | 8 ++++++++ scripts/pi-hole/php/footer.php | 8 ++++++++ scripts/pi-hole/php/func.php | 8 ++++++++ scripts/pi-hole/php/get.php | 8 ++++++++ scripts/pi-hole/php/gravity.sh.php | 8 ++++++++ scripts/pi-hole/php/header.php | 8 ++++++++ scripts/pi-hole/php/loginpage.php | 8 ++++++++ scripts/pi-hole/php/password.php | 8 ++++++++ scripts/pi-hole/php/queryads.php | 8 ++++++++ scripts/pi-hole/php/savesettings.php | 8 ++++++++ scripts/pi-hole/php/sub.php | 8 ++++++++ scripts/pi-hole/php/teleporter.php | 8 ++++++++ 14 files changed, 112 insertions(+) diff --git a/scripts/pi-hole/php/add.php b/scripts/pi-hole/php/add.php index 62c930ef..d4ca64db 100644 --- a/scripts/pi-hole/php/add.php +++ b/scripts/pi-hole/php/add.php @@ -1,3 +1,11 @@ + + + + +
    diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php index 37ef790f..57f61f08 100644 --- a/scripts/pi-hole/php/func.php +++ b/scripts/pi-hole/php/func.php @@ -1,3 +1,11 @@ + + + + + +
    diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php index 4abe9cfc..af9716bf 100644 --- a/scripts/pi-hole/php/password.php +++ b/scripts/pi-hole/php/password.php @@ -1,3 +1,11 @@ + + + + + + Date: Tue, 14 Feb 2017 15:01:40 +0100 Subject: [PATCH 015/132] Added header to scripts/pi-hole/js files --- scripts/pi-hole/js/footer.js | 6 ++++++ scripts/pi-hole/js/gravity.js | 6 ++++++ scripts/pi-hole/js/header.js | 6 ++++++ scripts/pi-hole/js/index.js | 6 ++++++ scripts/pi-hole/js/list.js | 6 ++++++ scripts/pi-hole/js/queries.js | 6 ++++++ scripts/pi-hole/js/queryads.js | 6 ++++++ scripts/pi-hole/js/settings.js | 6 ++++++ scripts/pi-hole/js/taillog.js | 6 ++++++ 9 files changed, 54 insertions(+) diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 6dd4ce65..5cdd042e 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -1,3 +1,9 @@ +/* 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. */ // User menu toggle $("#dropdown-menu a").on("click", function(event) { $(this).parent().toggleClass("open"); diff --git a/scripts/pi-hole/js/gravity.js b/scripts/pi-hole/js/gravity.js index 02c91e3c..20cf9fcd 100644 --- a/scripts/pi-hole/js/gravity.js +++ b/scripts/pi-hole/js/gravity.js @@ -1,3 +1,9 @@ +/* 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. */ function eventsource() { var alInfo = $("#alInfo"); var alSuccess = $("#alSuccess"); diff --git a/scripts/pi-hole/js/header.js b/scripts/pi-hole/js/header.js index 132f4fa2..e9f0478a 100644 --- a/scripts/pi-hole/js/header.js +++ b/scripts/pi-hole/js/header.js @@ -1,3 +1,9 @@ +/* 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. */ // Remove JS warning var jswarn = document.getElementById("js-warn-exit"); jswarn.parentNode.removeChild(jswarn); diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 89b1d2ba..537188fb 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -1,3 +1,9 @@ +/* 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. */ // Define global variables var timeLineChart, queryTypeChart, forwardDestinationChart; diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js index 379a3148..00a0b2ef 100644 --- a/scripts/pi-hole/js/list.js +++ b/scripts/pi-hole/js/list.js @@ -1,3 +1,9 @@ +/* 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. */ // IE likes to cache too much :P $.ajaxSetup({cache: false}); diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index 56912249..8a7d45a7 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -1,3 +1,9 @@ +/* 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. */ var tableApi; function escapeRegex(text) { diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 0786ada8..1b328566 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -1,3 +1,9 @@ +/* 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. */ var exact = ""; function quietfilter(ta,data) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 92796008..84bf41aa 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -1,3 +1,9 @@ +/* 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. */ $(function () { $("[data-mask]").inputmask(); diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js index 00cbfb15..ffe370fc 100644 --- a/scripts/pi-hole/js/taillog.js +++ b/scripts/pi-hole/js/taillog.js @@ -1,3 +1,9 @@ +/* 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. */ var offset, timer, pre, scrolling = true; // Check every 200msec for fresh data From 132a19ed84a9127e2173e64403d55388cc618806 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 14 Feb 2017 15:04:35 +0100 Subject: [PATCH 016/132] Added license header to our custom style script --- style/pi-hole.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/style/pi-hole.css b/style/pi-hole.css index 7ff36a0b..80ebba72 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -1,3 +1,9 @@ +/* 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. */ .small-box { -webkit-user-select: none; /* Chrome/Safari */ -moz-user-select: none; /* Firefox */ From 5b48803f90205d8bc6ef1d331a356b3a4a42715d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 16 Feb 2017 08:50:09 +0100 Subject: [PATCH 017/132] Slight reformulation --- LICENSE | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index da85e8d6..1a3787f5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,11 @@ Copyright (C) 2017 Pi-hole, LLC (https://pi-hole.net) Pi-hole web interface -This software is licensed under the European Union Public License - -This license is available in the 22 official languages of the EU. The English version is included here. +This software is licensed under the European Union Public License (EUPL) +The license is available in the 22 official languages of the EU. The English version is included here. Please see https://joinup.ec.europa.eu/community/eupl/og_page/eupl for official translations of the other languages. -This license applies to the whole project EXCEPT the files under +This license applies to the whole project EXCEPT the files located under - styles/vendor, and - scripts/vendor whose licenses are located therein. From aabff35bef88c00549144cf1f99cb9eb959ecb06 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 16 Feb 2017 08:52:30 +0100 Subject: [PATCH 018/132] Squashed commit of the following: - Dynamically fall back to PHP API functions to ensure API does always repond even if FTL is not runnung for some reason - Update PHP API from current devel branch - Increase flexibility in getQueryTypes API call - Hide top ads list if nothing to display - Proper display of activated privacy mode - Remove spinner (would otherwise not be removed for zero results) - Update tables every 10 seconds - Update query types and forward destinations plots every 10 seconds - More verbose output in top lists (total number next to percentage in tooltip) - Implemented "recentBlocked" keyword for API - Ensure compatibility with PHP5 version < 5.4 - Adjust output format of overTimeData10mins to comply with PHP API - Further speedup of Query Log page by showing only the recent 10 minutes by default - Hide temperature if FTL is not running and show FTL status - Add information to Settings page - Adjust error message when loading of query log failed - Move processing of domainname, clientIP, clientname and time interval filters for the Query Log page to FTL for speed enhancement - Generate link if pi.hole comes up in the Top Domains list - Remove resolve DNS names option - this is now enabled by default (daemon will only do it once per day instead of PHP-API which did it on every reloading of the web interface) - Add socket timeout of 10 seconds + modification to Settings page since FTL backend supports API_EXCLUDE_CLIENTS filtering with both IP addresses and host names (also mixed) - Improved Query Log page --- README.md | 4 +- api.php | 308 ++++++++++----- api_PHP.php | 118 ++++++ help.php | 21 +- index.php | 4 +- queries.php | 33 +- scripts/pi-hole/js/index.js | 94 +++-- scripts/pi-hole/js/queries.js | 81 ++-- scripts/pi-hole/js/taillog.js | 4 +- scripts/pi-hole/php/FTL.php | 103 +++++ scripts/pi-hole/php/header.php | 59 +-- scripts/pi-hole/php/savesettings.php | 33 +- scripts/vendor/moment.min.js | 551 +++++++++++++++++++++++++++ settings.php | 69 ++-- 14 files changed, 1214 insertions(+), 268 deletions(-) create mode 100644 api_PHP.php create mode 100644 scripts/pi-hole/php/FTL.php create mode 100644 scripts/vendor/moment.min.js diff --git a/README.md b/README.md index 12769874..6e7e1668 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ A read-only API can be accessed at `/admin/api.php`. With either no parameters o } ``` -There are many more parameters, such as `summaryRaw`, `overTimeData10mins`, ` topClients` or `getQuerySources`, `getQueryTypes`, `getForwardDestinations`, and `getAllQueries`. -Together with a token it is also possible to enable and disable (also with a set timeout) blocking via the API. +There are many more parameters, such as `summaryRaw`, `overTimeData10mins`, `topItems`, ` topClients` or `getQuerySources`, `getQueryTypes`, `getForwardDestinations`, and finally `getAllQueries`. +Together with a token it is also possible to enable and disable (also with a set timeout) blocking via the API

    diff --git a/api.php b/api.php index a9aaa3b2..b8e0024c 100644 --- a/api.php +++ b/api.php @@ -5,120 +5,238 @@ * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. --> $domains_over_time, + 'ads_over_time' => $ads_over_time); + $data = array_merge($data, $result); + } - if (isset($_GET['topItems']) && $auth) { - $data = array_merge($data, getTopItems($_GET['topItems'])); - } + if (isset($_GET['topItems']) && $auth) + { + if(is_numeric($_GET['topItems'])) + { + sendRequestFTL("top-domains ".$_GET['topItems']); + } + else + { + sendRequestFTL("top-domains"); + } - if (isset($_GET['recentItems']) && $auth) { - if (is_numeric($_GET['recentItems'])) { - $data = array_merge($data, getRecentItems($_GET['recentItems'])); - } - } + $return = getResponseFTL(); + $top_queries = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $top_queries[$tmp[2]] = $tmp[1]; + } - if (isset($_GET['getQueryTypes']) && $auth) { - $data = array_merge($data, getIpvType()); - } + if(is_numeric($_GET['topItems'])) + { + sendRequestFTL("top-ads ".$_GET['topItems']); + } + else + { + sendRequestFTL("top-ads"); + } - if (isset($_GET['getForwardDestinations']) && $auth) { - $data = array_merge($data, getForwardDestinations()); - } + $return = getResponseFTL(); + $top_ads = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $top_ads[$tmp[2]] = $tmp[1]; + } - if (isset($_GET['getQuerySources']) && $auth) { - $data = array_merge($data, getQuerySources()); - } + $result = array('top_queries' => $top_queries, + 'top_ads' => $top_ads); - if (isset($_GET['getAllQueries']) && $auth) { - $data = array_merge($data, getAllQueries($_GET['getAllQueries'])); - } + $data = array_merge($data, $result); + } - if (isset($_GET['enable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - exec('sudo pihole enable'); - $data = array_merge($data, Array( - "status" => "enabled" - )); - } - elseif (isset($_GET['disable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - $disable = intval($_GET['disable']); - // intval returns the integer value on success, or 0 on failure - if($disable > 0) - { - exec("sudo pihole disable ".$disable."s"); - } - else - { - exec('sudo pihole disable'); - } - $data = array_merge($data, Array( - "status" => "disabled" - )); - } + if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) + { + sendRequestFTL("top-clients"); + $return = getResponseFTL(); + $top_clients = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + if(count($tmp) == 4) + { + $top_clients[$tmp[3]."|".$tmp[2]] = $tmp[1]; + } + else + { + $top_clients[$tmp[2]] = $tmp[1]; + } + } - if (isset($_GET['getGravityDomains'])) { - $data = array_merge($data, getGravity()); - } + $result = array('top_sources' => $top_clients); + $data = array_merge($data, $result); + } - if (isset($_GET['tailLog']) && $auth) { - $data = array_merge($data, tailPiholeLog($_GET['tailLog'])); - } + if (isset($_GET['getForwardDestinations']) && $auth) + { + sendRequestFTL("forward-dest"); + $return = getResponseFTL(); + $forward_dest = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + if(count($tmp) == 4) + { + $forward_dest[$tmp[3]."|".$tmp[2]] = $tmp[1]; + } + else + { + $forward_dest[$tmp[2]] = $tmp[1]; + } + } - function filterArray(&$inArray) { - $outArray = array(); - foreach ($inArray as $key=>$value) { - if (is_array($value)) { - $outArray[htmlspecialchars($key)] = filterArray($value); - } else { - $outArray[htmlspecialchars($key)] = !is_numeric($value) ? htmlspecialchars($value) : $value; - } - } - return $outArray; - } + $result = array('forward_destinations' => $forward_dest); + $data = array_merge($data, $result); + } - $data = filterArray($data); + if (isset($_GET['getQueryTypes']) && $auth) + { + sendRequestFTL("querytypes"); + $return = getResponseFTL(); + $querytypes = array(); + foreach($return as $ret) + { + $tmp = explode(": ",$ret); + $querytypes[$tmp[0]] = $tmp[1]; + } - if(isset($_GET["jsonForceObject"])) - { - echo json_encode($data, JSON_FORCE_OBJECT); - } - else - { - echo json_encode($data); - } + $result = array('querytypes' => $querytypes); + $data = array_merge($data, $result); + } + + if (isset($_GET['getAllQueries']) && $auth) + { + if(isset($_GET['from']) && isset($_GET['until'])) + { + // Get limited time interval + sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']); + } + else if(isset($_GET['domain'])) + { + // Get specific domain only + sendRequestFTL("getallqueries-domain ".$_GET['domain']); + } + else if(isset($_GET['client'])) + { + // Get specific client only + sendRequestFTL("getallqueries-client ".$_GET['client']); + } + else + { + // Get all queries + sendRequestFTL("getallqueries"); + } + $return = getResponseFTL(); + $allQueries = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + array_push($allQueries,$tmp); + } + + $result = array('data' => $allQueries); + $data = array_merge($data, $result); + } + + if (isset($_GET['enable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + exec('sudo pihole enable'); + $data = array_merge($data, array("status" => "enabled")); + } + elseif (isset($_GET['disable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + $disable = intval($_GET['disable']); + // intval returns the integer value on success, or 0 on failure + if($disable > 0) + { + exec("sudo pihole disable ".$disable."s"); + } + else + { + exec('sudo pihole disable'); + } + $data = array_merge($data, array("status" => "disabled")); + } + + if(isset($_GET["recentBlocked"])) + { + sendRequestFTL("recentBlocked"); + echo getResponseFTL()[0]; + unset($data); + } + + if(isset($data)) + { + echo json_encode($data); + } + + disconnectFTL(); ?> diff --git a/api_PHP.php b/api_PHP.php new file mode 100644 index 00000000..589ae0bd --- /dev/null +++ b/api_PHP.php @@ -0,0 +1,118 @@ + "enabled" + )); + } + elseif (isset($_GET['disable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + $disable = intval($_GET['disable']); + // intval returns the integer value on success, or 0 on failure + if($disable > 0) + { + exec("sudo pihole disable ".$disable."s"); + } + else + { + exec('sudo pihole disable'); + } + $data = array_merge($data, Array( + "status" => "disabled" + )); + } + + if (isset($_GET['getGravityDomains'])) { + $data = array_merge($data, getGravity()); + } + + if (isset($_GET['tailLog']) && $auth) { + $data = array_merge($data, tailPiholeLog($_GET['tailLog'])); + } + + function filterArray(&$inArray) { + $outArray = array(); + foreach ($inArray as $key=>$value) { + if (is_array($value)) { + $outArray[htmlspecialchars($key)] = filterArray($value); + } else { + $outArray[htmlspecialchars($key)] = !is_numeric($value) ? htmlspecialchars($value) : $value; + } + } + return $outArray; + } + + $data = filterArray($data); + + if(isset($_GET["jsonForceObject"])) + { + echo json_encode($data, JSON_FORCE_OBJECT); + } + else + { + echo json_encode($data); + } +?> diff --git a/help.php b/help.php index e4960973..c3e729a9 100644 --- a/help.php +++ b/help.php @@ -48,20 +48,13 @@
    • Summary: A summary of statistics showing how many total DNS queries have been blocked today, what percentage of DNS queries have been blocked, and how many domains are in the compiled ad list. This summary is updated every 10 seconds.
    • Queries over time: Graph showing DNS queries (total and blocked) over 10 minute time intervals. More information can be acquired by hovering over the lines. This graph is updated every 10 minutes.
      • -
    • Query Types: Identifies the types of processed queries: -
        -
      • A: address lookup (most commonly used to map hostnames to an IPv4 address of the host)
        • -
      • AAAA: address lookup (most commonly used to map hostnames to an IPv6 address of the host)
        • -
      • PTR: most common use is for implementing reverse DNS lookups
        • -
      • SRV: Service locator (often used by XMPP, SIP, and LDAP)
        • -
      • and others
        • -
      -
      • +
    • Query Types: Identifies the types of processed queries
    • Forward Destinations: Shows to which upstream DNS the permitted requests have been forwarded to.
    • Top Domains: Ranking of requested sites by number of DNS lookups.
    • Top Advertisers: Ranking of requested advertisements by number of DNS lookups.
    • Top Clients: Ranking of how many DNS requests each client has made on the local network.
    +

    The Top Domains and Top Advertisers lists may be hidden depending on the privacy Settings on the settings page

    Note that the login session does not expire on the main page, as the summary is updated every 10 seconds which refreshes the session.

    @@ -70,7 +63,7 @@

    Query Log

    -

    Shows the recent queries by parsing Pi-hole's log. It is possible to search through the whole list by using the "Search" input field. If the status is reported as "OK", then the DNS request has been permitted. Otherwise ("Pi-holed") it has been blocked. By clicking on the buttons under "Action" the corresponding domains can quickly be added to the white-/blacklist. The status of the action will be reported on this page.

    +

    Shows the recent queries by parsing Pi-hole's log. It is possible to search through the whole list by using the "Search" input field. If the status is reported as "OK", then the DNS request has been permitted. Otherwise ("Pi-holed") it has been blocked. By clicking on the buttons under "Action" the corresponding domains can quickly be added to the white-/blacklist. The status of the action will be reported on this page. By default, only the recent 10 minutes are shown to enhance the loading speed of the query log page. All domains can be requested by clicking on the corresponding link in the header of the page. Note that the result heavily depends on your privacy settings (see Settings page).

    @@ -118,8 +111,12 @@

    Query Logging

    Enabled/disable query logging on your Pi-hole + provide option to flush the log

    API

    - Change settings which apply to the API as well as the web UI
    - Note that Top Clients have to be given as IP addresses + Change settings which apply to the API as well as the web UI +
      +
    • Show permitted domain entries: Toogle permitted queries in Query Log + Top Domains on Main Page
      • +
    • Show blockes domain entries: Toogle blocked queries in Query Log + Top Ads on Main Page
      • +
    • Privacy mode: Replace IPs in query log with "hidden"
      • +

    Web User Interface

    Other settings which affect the webUI but not the API of Pi-hole

    System Administration

    diff --git a/index.php b/index.php index 659a868a..5ea7b172 100644 --- a/index.php +++ b/index.php @@ -96,7 +96,7 @@
    - +
    @@ -112,7 +112,7 @@
    - +
    diff --git a/queries.php b/queries.php index 8e81c677..7dd4d1ae 100644 --- a/queries.php +++ b/queries.php @@ -19,30 +19,52 @@ if(isset($setupVars["API_QUERY_LOG_SHOW"])) { if($setupVars["API_QUERY_LOG_SHOW"] === "all") { - $showing = "(showing all queries)"; + $showing = "(showing all queries"; } elseif($setupVars["API_QUERY_LOG_SHOW"] === "permittedonly") { - $showing = "(showing permitted queries only)"; + $showing = "(showing permitted queries only"; } elseif($setupVars["API_QUERY_LOG_SHOW"] === "blockedonly") { - $showing = "(showing blocked queries only)"; + $showing = "(showing blocked queries only"; } elseif($setupVars["API_QUERY_LOG_SHOW"] === "nothing") { - $showing = "(showing no queries at all)"; + $showing = "(showing no queries at all"; } } +if(isset($_GET["all"])) +{ + $showing .= " within the Pi-hole log"; +} +else if(isset($_GET["client"])) +{ + $showing .= " for client ".htmlentities($_GET["client"]); +} +else if(isset($_GET["domain"])) +{ + $showing .= " for domain ".htmlentities($_GET["domain"]); +} +else if(isset($_GET["from"]) && isset($_GET["until"])) +{ + $showing .= " within limited time interval"; +} +else +{ + $showing .= " within recent 10 minutes, show all"; +} + if(isset($setupVars["API_PRIVACY_MODE"])) { if($setupVars["API_PRIVACY_MODE"]) { // Overwrite string from above - $showing = "(privacy mode enabled)"; + $showing .= ", privacy mode enabled"; } } +$showing .= ")"; ?> @@ -114,4 +136,5 @@ if(isset($setupVars["API_PRIVACY_MODE"])) require "scripts/pi-hole/php/footer.php"; ?> + diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 537188fb..7c0dc79a 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -104,21 +104,26 @@ function updateQueryTypes() { var colors = []; // Get colors from AdminLTE $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); }); - var v = [], c = []; - // Collect values and colors, immediately push individual labels - $.each(data, function(key , value) { + var v = [], c = [], k = []; + // Collect values and colors, and labels + $.each(data.querytypes, function(key , value) { v.push(value); c.push(colors.shift()); - queryTypeChart.data.labels.push(key.substr(6,key.length - 7)); + k.push(key); }); // Build a single dataset with the data to be pushed var dd = {data: v, backgroundColor: c}; // and push it at once - queryTypeChart.data.datasets.push(dd); + queryTypeChart.data.datasets[0] = dd; + queryTypeChart.data.labels = k; $("#query-types .overlay").remove(); queryTypeChart.update(); - queryTypeChart.chart.config.options.cutoutPercentage=30; + queryTypeChart.chart.config.options.cutoutPercentage=50; queryTypeChart.update(); + // Don't use rotation animation for further updates + queryTypeChart.options.animation.duration=0; + // Update query types data every 10 seconds + setTimeout(updateQueryTypes, 10000); }); } @@ -137,35 +142,39 @@ function escapeHtml(text) { function updateTopClientsChart() { $.getJSON("api.php?summaryRaw&getQuerySources", function(data) { + // Clear tables before filling them with data + $("#client-frequency td").parent().remove(); var clienttable = $("#client-frequency").find("tbody:last"); - var domain, percentage, domainname, domainip; - for (domain in data.top_sources) { + var client, percentage, clientname, clientip; + for (client in data.top_sources) { - if ({}.hasOwnProperty.call(data.top_sources, domain)){ - // Sanitize domain - domain = escapeHtml(domain); - if(domain.indexOf("|") > -1) + if ({}.hasOwnProperty.call(data.top_sources, client)){ + // Sanitize client + client = escapeHtml(client); + if(client.indexOf("|") > -1) { - var idx = domain.indexOf("|"); - domainname = domain.substr(0, idx); - domainip = domain.substr(idx+1, domain.length-idx); + var idx = client.indexOf("|"); + clientname = client.substr(0, idx); + clientip = client.substr(idx+1, client.length-idx); } else { - domainname = domain; - domainip = domain; + clientname = client; + clientip = client; } - var url = ""+domainname+""; - percentage = data.top_sources[domain] / data.dns_queries_today * 100; + var url = ""+clientname+""; + percentage = data.top_sources[client] / data.dns_queries_today * 100; clienttable.append(" " + url + - " " + data.top_sources[domain] + "
    " + data.top_sources[client] + "
    "); } } $("#client-frequency .overlay").remove(); + // Update top clients list data every 10 seconds + setTimeout(updateTopClientsChart, 10000); }); } @@ -174,9 +183,9 @@ function updateForwardDestinations() { var colors = []; // Get colors from AdminLTE $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); }); - var v = [], c = []; + var v = [], c = [], k = []; // Collect values and colors, immediately push individual labels - $.each(data, function(key , value) { + $.each(data.forward_destinations, function(key , value) { v.push(value); c.push(colors.shift()); if(key.indexOf("|") > -1) @@ -184,21 +193,29 @@ function updateForwardDestinations() { var idx = key.indexOf("|"); key = key.substr(0, idx)+" ("+key.substr(idx+1, key.length-idx)+")"; } - forwardDestinationChart.data.labels.push(key); + k.push(key); }); // Build a single dataset with the data to be pushed var dd = {data: v, backgroundColor: c}; // and push it at once - forwardDestinationChart.data.datasets.push(dd); + forwardDestinationChart.data.datasets[0] = dd; + forwardDestinationChart.data.labels = k; $("#forward-destinations .overlay").remove(); forwardDestinationChart.update(); - forwardDestinationChart.chart.config.options.cutoutPercentage=30; + forwardDestinationChart.chart.config.options.cutoutPercentage=50; forwardDestinationChart.update(); + // Don't use rotation animation for further updates + forwardDestinationChart.options.animation.duration=0; + // Update forward destinations data every 10 seconds + setTimeout(updateForwardDestinations, 10000); }); } function updateTopLists() { $.getJSON("api.php?summaryRaw&topItems", function(data) { + // Clear tables before filling them with data + $("#domain-frequency td").parent().remove(); + $("#ad-frequency td").parent().remove(); var domaintable = $("#domain-frequency").find("tbody:last"); var adtable = $("#ad-frequency").find("tbody:last"); var url, domain, percentage; @@ -206,17 +223,10 @@ function updateTopLists() { if ({}.hasOwnProperty.call(data.top_queries,domain)){ // Sanitize domain domain = escapeHtml(domain); - if(domain !== "pi.hole") - { - url = ""+domain+""; - } - else - { - url = domain; - } + url = ""+domain+""; percentage = data.top_queries[domain] / data.dns_queries_today * 100; domaintable.append(" " + url + - " " + data.top_queries[domain] + "
    " + data.top_queries[domain] + "
    "); } } @@ -234,13 +244,21 @@ function updateTopLists() { url = ""+domain+""; percentage = data.top_ads[domain] / data.ads_blocked_today * 100; adtable.append(" " + url + - " " + data.top_ads[domain] + "
    " + data.top_ads[domain] + "
    "); } } + // Remove table if there are no results (e.g. privacy mode enabled) + if(jQuery.isEmptyObject(data.top_ads)) + { + $("#ad-frequency").parent().remove(); + } + $("#domain-frequency .overlay").remove(); $("#ad-frequency .overlay").remove(); + // Update top lists data every 10 seconds + setTimeout(updateTopLists, 10000); }); } @@ -429,10 +447,8 @@ $(document).ready(function() { var label = timeLineChart.data.labels[clickedElementindex]; //get value by index - //var value = timeLineChart.data.datasets[0].data[clickedElementindex]; - var time = new Date(label); - var from = time.getHours()+":"+time.getMinutes(); - var until = time.getHours()+":"+padNumber(parseInt(time.getMinutes()+9),2); + var from = label/1000; + var until = label/1000 + 600; window.location.href = "queries.php?from="+from+"&until="+until; } return false; diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index 8a7d45a7..f5abc74e 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -79,11 +79,17 @@ function add(domain,list) { }); } function handleAjaxError( xhr, textStatus, error ) { - if ( textStatus === "timeout" ) { + if ( textStatus === "timeout" ) + { alert( "The server took too long to send the data." ); } - else { - alert( "An error occured while loading the data. Presumably your log is too large to be processed." ); + else if(xhr.responseText.indexOf("Connection refused") >= 0) + { + alert( "An error occured while loading the data: Connection refused. Is FTL running?" ); + } + else + { + alert( "An unknown error occured while loading the data." ); } $("#all-queries_processing").hide(); tableApi.clear(); @@ -99,32 +105,58 @@ $(document).ready(function() { var APIstring = "api.php?getAllQueries"; - if("from" in GETDict) + if("from" in GETDict && "until" in GETDict) { APIstring += "&from="+GETDict["from"]; - } - - if("until" in GETDict) - { APIstring += "&until="+GETDict["until"]; } + else if("client" in GETDict) + { + APIstring += "&client="+GETDict["client"]; + } + else if("domain" in GETDict) + { + APIstring += "&domain="+GETDict["domain"]; + } + else if(!("all" in GETDict)) + { + var timestamp = Math.floor(Date.now() / 1000); + APIstring += "&from="+(timestamp - 600); + APIstring += "&until="+(timestamp + 100); + } tableApi = $("#all-queries").DataTable( { "rowCallback": function( row, data, index ){ - status = data[4]; - if (status === "Pi-holed (exact)") { + if (data[4] === "1") + { $(row).css("color","red"); + $("td:eq(4)", row).html( "Pi-holed" ); $("td:eq(5)", row).html( "" ); } - else if (status === "Pi-holed (wildcard)") { - $(row).css("color","red"); - $("td:eq(5)", row).html( "" ); - } - else{ + else if (data[4] === "2") + { $(row).css("color","green"); + $("td:eq(4)", row).html( "OK (forwarded)" ); $("td:eq(5)", row).html( "" ); } + else if (data[4] === "3") + { + $(row).css("color","green"); + $("td:eq(4)", row).html( "OK (cached)" ); + $("td:eq(5)", row).html( "" ); + } + else if (data[4] === "4") + { + $(row).css("color","red"); + $("td:eq(4)", row).html( "Pi-holed (wildcard)" ); + $("td:eq(5)", row).html( "" ); + } + else + { + $("td:eq(4)", row).html( "Unknown" ); + $("td:eq(5)", row).html( "" ); + } }, dom: "<'row'<'col-sm-12'f>>" + "<'row'<'col-sm-4'l><'col-sm-8'p>>" + @@ -135,7 +167,7 @@ $(document).ready(function() { "processing": true, "order" : [[0, "desc"]], "columns": [ - { "width" : "20%", "type": "date" }, + { "width" : "20%", "render": function (data, type, full, meta) { if(type === "display"){return moment.unix(data).format("Y-MM-DD HH:mm:ss z");}else{return data;} }}, { "width" : "10%" }, { "width" : "40%" }, { "width" : "10%" }, @@ -151,8 +183,7 @@ $(document).ready(function() { }); $("#all-queries tbody").on( "click", "button", function () { var data = tableApi.row( $(this).parents("tr") ).data(); - status = data[4]; - if (status.substr(0,2) === "Pi") + if (data[4] === "1") { add(data[2],"white"); } @@ -161,20 +192,6 @@ $(document).ready(function() { add(data[2],"black"); } } ); - - if("client" in GETDict) - { - // Search in third column (zero indexed) - // Use regular expression to only show exact matches, i.e. - // don't show 192.168.0.100 when searching for 192.168.0.1 - // true = use regex, false = don't use smart search - tableApi.column(3).search("^"+escapeRegex(GETDict["client"])+"$",true,false); - } - if("domain" in GETDict) - { - // Search in second column (zero indexed) - tableApi.column(2).search("^"+escapeRegex(GETDict["domain"])+"$",true,false); - } } ); diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js index ffe370fc..32272de9 100644 --- a/scripts/pi-hole/js/taillog.js +++ b/scripts/pi-hole/js/taillog.js @@ -12,7 +12,7 @@ var interval = 200; // Function that asks the API for new data function reloadData(){ clearTimeout(timer); - $.getJSON("api.php?tailLog="+offset, function (data) + $.getJSON("api_PHP.php?tailLog="+offset, function (data) { offset = data["offset"]; pre.append(data["lines"]); @@ -27,7 +27,7 @@ function reloadData(){ $(function(){ // Get offset at first loading of page - $.getJSON("api.php?tailLog", function (data) + $.getJSON("api_PHP.php?tailLog", function (data) { offset = data["offset"]; }); diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php new file mode 100644 index 00000000..91cffdd2 --- /dev/null +++ b/scripts/pi-hole/php/FTL.php @@ -0,0 +1,103 @@ +10, 'usec'=>0]); + socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec'=>10, 'usec'=>0]); + + if(!$quiet) + { + echo "Success!\n\n"; + } + + return $socket; +} +function sendRequestFTL($requestin, $quiet=true) +{ + global $socket; + + $request = ">".$requestin; + if(!$quiet) + { + echo "Sending request (".$request.")...\n"; + } + + socket_write($socket, $request, strlen($request)) or die("Could not send data to server\n"); + if(!$quiet) + { + echo "OK.\n"; + } +} + +function getResponseFTL($quiet=true) +{ + global $socket; + if(!$quiet) + { + echo "Reading response:\n"; + } + + $response = []; + + while(true) + { + $out = socket_read($socket, 2048, PHP_NORMAL_READ); + if(!$quiet) + { + echo $out; + } + if(strrpos($out,"---EOM---") !== false) + { + break; + } + $out = rtrim($out); + if(strlen($out) > 0) + { + $response[] = $out; + } + } + + return $response; +} + +function disconnectFTL($quiet=true) +{ + global $socket; + if(!$quiet) + { + echo "Closing socket..."; + } + + socket_close($socket); + + if(!$quiet) + { + echo "OK.\n\n"; + } +} diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index bda379e7..009d0892 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -130,6 +130,12 @@ $boxedlayout = false; } } + + if(strpos(exec("ps -p `cat /var/run/pihole-FTL.pid` -o comm="), "pihole-FTL") !== false) + { + $FTL = true; + } + ?> @@ -263,7 +269,7 @@

    Status

    - Active'; @@ -276,29 +282,36 @@ } // CPU Temp - if ($celsius >= -273.15) { - echo " 60) { - echo "#FF0000"; + if($FTL) + { + if ($celsius >= -273.15) { + echo " 60) { + echo "#FF0000"; + } + else + { + echo "#3366FF"; + } + echo "\"> Temp: "; + if($temperatureunit === "F") + { + echo round($fahrenheit,1) . "°F"; + } + elseif($temperatureunit === "K") + { + echo round($kelvin,1) . "K"; + } + else + { + echo round($celsius,1) . "°C"; + } + echo ""; } - else - { - echo "#3366FF"; - } - echo "\"> Temp: "; - if($temperatureunit === "F") - { - echo round($fahrenheit,1) . "°F"; - } - elseif($temperatureunit === "K") - { - echo round($kelvin,1) . "K"; - } - else - { - echo round($celsius,1) . "°C"; - } - echo ""; + } + else + { + echo ' FTL offline'; } ?>
    diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index fcfae51a..ed1d8e17 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -44,6 +44,15 @@ function validDomain($domain_name) return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label } +function validDomainWildcard($domain_name) +{ + // There has to be either no or at most one "*" at the beginning of a line + $validChars = preg_match("/^((\*)?[_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([a-z\d])*)*$/i", $domain_name); + $lengthCheck = preg_match("/^.{1,253}$/", $domain_name); + $labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name); + return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label +} + function validMAC($mac_addr) { // Accepted input format: 00:01:02:1A:5F:FF (characters may be lower case) @@ -215,9 +224,9 @@ function readStaticLeasesFile() $first = true; foreach($domains as $domain) { - if(!validDomain($domain)) + if(!validDomainWildcard($domain) || validIP($domain)) { - $error .= "Top Domains/Ads entry ".htmlspecialchars($domain)." is invalid!
    "; + $error .= "Top Domains/Ads entry ".htmlspecialchars($domain)." is invalid (use only domains)!
    "; } if(!$first) { @@ -234,7 +243,7 @@ function readStaticLeasesFile() $first = true; foreach($clients as $client) { - if(!validIP($client)) + if(!validDomainWildcard($client)) { $error .= "Top Clients entry ".htmlspecialchars($client)." is invalid (use only IP addresses)!
    "; } @@ -309,24 +318,6 @@ function readStaticLeasesFile() exec("sudo pihole -a privacymode false"); } - if(isset($_POST["resolve-forward"])) - { - exec("sudo pihole -a resolve forward true"); - } - else - { - exec("sudo pihole -a resolve forward false"); - } - - if(isset($_POST["resolve-clients"])) - { - exec("sudo pihole -a resolve clients true"); - } - else - { - exec("sudo pihole -a resolve clients false"); - } - break; case "webUI": diff --git a/scripts/vendor/moment.min.js b/scripts/vendor/moment.min.js new file mode 100644 index 00000000..8c706712 --- /dev/null +++ b/scripts/vendor/moment.min.js @@ -0,0 +1,551 @@ +//! moment.js +//! version : 2.17.1 +//! authors : Tim Wood, Iskren Chernev, Moment.js contributors +//! license : MIT +//! momentjs.com +!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return od.apply(null,arguments)} +// This is done to register the method called with moment() +// without creating circular dependencies. +function b(a){od=a}function c(a){return a instanceof Array||"[object Array]"===Object.prototype.toString.call(a)}function d(a){ +// IE8 will treat undefined and null as object if it wasn't for +// input != null +return null!=a&&"[object Object]"===Object.prototype.toString.call(a)}function e(a){var b;for(b in a) +// even if its not own property I'd still call it non-empty +return!1;return!0}function f(a){return"number"==typeof a||"[object Number]"===Object.prototype.toString.call(a)}function g(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function h(a,b){var c,d=[];for(c=0;c0)for(c in rd)d=rd[c],e=b[d],p(e)||(a[d]=e);return a} +// Moment prototype object +function r(b){q(this,b),this._d=new Date(null!=b._d?b._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)), +// Prevent infinite loop in case updateOffset creates new moment +// objects. +sd===!1&&(sd=!0,a.updateOffset(this),sd=!1)}function s(a){return a instanceof r||null!=a&&null!=a._isAMomentObject}function t(a){return a<0?Math.ceil(a)||0:Math.floor(a)}function u(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=t(b)),c} +// compare two arrays, return the number of differences +function v(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;d0?"future":"past"];return z(c)?c(b):c.replace(/%s/i,b)}function J(a,b){var c=a.toLowerCase();Dd[c]=Dd[c+"s"]=Dd[b]=a}function K(a){return"string"==typeof a?Dd[a]||Dd[a.toLowerCase()]:void 0}function L(a){var b,c,d={};for(c in a)i(a,c)&&(b=K(c),b&&(d[b]=a[c]));return d}function M(a,b){Ed[a]=b}function N(a){var b=[];for(var c in a)b.push({unit:c,priority:Ed[c]});return b.sort(function(a,b){return a.priority-b.priority}),b}function O(b,c){return function(d){return null!=d?(Q(this,b,d),a.updateOffset(this,c),this):P(this,b)}}function P(a,b){return a.isValid()?a._d["get"+(a._isUTC?"UTC":"")+b]():NaN}function Q(a,b,c){a.isValid()&&a._d["set"+(a._isUTC?"UTC":"")+b](c)} +// MOMENTS +function R(a){return a=K(a),z(this[a])?this[a]():this}function S(a,b){if("object"==typeof a){a=L(a);for(var c=N(a),d=0;d=0;return(f?c?"+":"":"-")+Math.pow(10,Math.max(0,e)).toString().substr(1)+d} +// token: 'M' +// padded: ['MM', 2] +// ordinal: 'Mo' +// callback: function () { this.month() + 1 } +function U(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(Id[a]=e),b&&(Id[b[0]]=function(){return T(e.apply(this,arguments),b[1],b[2])}),c&&(Id[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function V(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function W(a){var b,c,d=a.match(Fd);for(b=0,c=d.length;b=0&&Gd.test(a);)a=a.replace(Gd,c),Gd.lastIndex=0,d-=1;return a}function Z(a,b,c){$d[a]=z(b)?b:function(a,d){return a&&c?c:b}}function $(a,b){return i($d,a)?$d[a](b._strict,b._locale):new RegExp(_(a))} +// Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript +function _(a){return aa(a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}))}function aa(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function ba(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),f(b)&&(d=function(a,c){c[b]=u(a)}),c=0;c=0&&isFinite(h.getFullYear())&&h.setFullYear(a),h}function ta(a){var b=new Date(Date.UTC.apply(null,arguments)); +//the Date.UTC function remaps years 0-99 to 1900-1999 +return a<100&&a>=0&&isFinite(b.getUTCFullYear())&&b.setUTCFullYear(a),b} +// start-of-first-week - start-of-year +function ua(a,b,c){var// first-week day -- which january is always in the first week (4 for iso, 1 for other) +d=7+b-c, +// first-week day local weekday -- which local weekday is fwd +e=(7+ta(a,0,d).getUTCDay()-b)%7;return-e+d-1} +//http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday +function va(a,b,c,d,e){var f,g,h=(7+c-d)%7,i=ua(a,d,e),j=1+7*(b-1)+h+i;return j<=0?(f=a-1,g=pa(f)+j):j>pa(a)?(f=a+1,g=j-pa(a)):(f=a,g=j),{year:f,dayOfYear:g}}function wa(a,b,c){var d,e,f=ua(a.year(),b,c),g=Math.floor((a.dayOfYear()-f-1)/7)+1;return g<1?(e=a.year()-1,d=g+xa(e,b,c)):g>xa(a.year(),b,c)?(d=g-xa(a.year(),b,c),e=a.year()+1):(e=a.year(),d=g),{week:d,year:e}}function xa(a,b,c){var d=ua(a,b,c),e=ua(a+1,b,c);return(pa(a)-d+e)/7} +// HELPERS +// LOCALES +function ya(a){return wa(a,this._week.dow,this._week.doy).week}function za(){return this._week.dow}function Aa(){return this._week.doy} +// MOMENTS +function Ba(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function Ca(a){var b=wa(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")} +// HELPERS +function Da(a,b){return"string"!=typeof a?a:isNaN(a)?(a=b.weekdaysParse(a),"number"==typeof a?a:null):parseInt(a,10)}function Ea(a,b){return"string"==typeof a?b.weekdaysParse(a)%7||7:isNaN(a)?null:a}function Fa(a,b){return a?c(this._weekdays)?this._weekdays[a.day()]:this._weekdays[this._weekdays.isFormat.test(b)?"format":"standalone"][a.day()]:this._weekdays}function Ga(a){return a?this._weekdaysShort[a.day()]:this._weekdaysShort}function Ha(a){return a?this._weekdaysMin[a.day()]:this._weekdaysMin}function Ia(a,b,c){var d,e,f,g=a.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],d=0;d<7;++d)f=k([2e3,1]).day(d),this._minWeekdaysParse[d]=this.weekdaysMin(f,"").toLocaleLowerCase(),this._shortWeekdaysParse[d]=this.weekdaysShort(f,"").toLocaleLowerCase(),this._weekdaysParse[d]=this.weekdays(f,"").toLocaleLowerCase();return c?"dddd"===b?(e=je.call(this._weekdaysParse,g),e!==-1?e:null):"ddd"===b?(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:null):(e=je.call(this._minWeekdaysParse,g),e!==-1?e:null):"dddd"===b?(e=je.call(this._weekdaysParse,g),e!==-1?e:(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:(e=je.call(this._minWeekdaysParse,g),e!==-1?e:null))):"ddd"===b?(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:(e=je.call(this._weekdaysParse,g),e!==-1?e:(e=je.call(this._minWeekdaysParse,g),e!==-1?e:null))):(e=je.call(this._minWeekdaysParse,g),e!==-1?e:(e=je.call(this._weekdaysParse,g),e!==-1?e:(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:null)))}function Ja(a,b,c){var d,e,f;if(this._weekdaysParseExact)return Ia.call(this,a,b,c);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),d=0;d<7;d++){ +// test the regex +if( +// make the regex if we don't have it already +e=k([2e3,1]).day(d),c&&!this._fullWeekdaysParse[d]&&(this._fullWeekdaysParse[d]=new RegExp("^"+this.weekdays(e,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[d]=new RegExp("^"+this.weekdaysShort(e,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[d]=new RegExp("^"+this.weekdaysMin(e,"").replace(".",".?")+"$","i")),this._weekdaysParse[d]||(f="^"+this.weekdays(e,"")+"|^"+this.weekdaysShort(e,"")+"|^"+this.weekdaysMin(e,""),this._weekdaysParse[d]=new RegExp(f.replace(".",""),"i")),c&&"dddd"===b&&this._fullWeekdaysParse[d].test(a))return d;if(c&&"ddd"===b&&this._shortWeekdaysParse[d].test(a))return d;if(c&&"dd"===b&&this._minWeekdaysParse[d].test(a))return d;if(!c&&this._weekdaysParse[d].test(a))return d}} +// MOMENTS +function Ka(a){if(!this.isValid())return null!=a?this:NaN;var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Da(a,this.localeData()),this.add(a-b,"d")):b}function La(a){if(!this.isValid())return null!=a?this:NaN;var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Ma(a){if(!this.isValid())return null!=a?this:NaN; +// behaves the same as moment#day except +// as a getter, returns 7 instead of 0 (1-7 range instead of 0-6) +// as a setter, sunday should belong to the previous week. +if(null!=a){var b=Ea(a,this.localeData());return this.day(this.day()%7?b:b-7)}return this.day()||7}function Na(a){return this._weekdaysParseExact?(i(this,"_weekdaysRegex")||Qa.call(this),a?this._weekdaysStrictRegex:this._weekdaysRegex):(i(this,"_weekdaysRegex")||(this._weekdaysRegex=ue),this._weekdaysStrictRegex&&a?this._weekdaysStrictRegex:this._weekdaysRegex)}function Oa(a){return this._weekdaysParseExact?(i(this,"_weekdaysRegex")||Qa.call(this),a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(i(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ve),this._weekdaysShortStrictRegex&&a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)}function Pa(a){return this._weekdaysParseExact?(i(this,"_weekdaysRegex")||Qa.call(this),a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(i(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=we),this._weekdaysMinStrictRegex&&a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)}function Qa(){function a(a,b){return b.length-a.length}var b,c,d,e,f,g=[],h=[],i=[],j=[];for(b=0;b<7;b++) +// make the regex if we don't have it already +c=k([2e3,1]).day(b),d=this.weekdaysMin(c,""),e=this.weekdaysShort(c,""),f=this.weekdays(c,""),g.push(d),h.push(e),i.push(f),j.push(d),j.push(e),j.push(f);for( +// Sorting makes sure if one weekday (or abbr) is a prefix of another it +// will match the longer piece. +g.sort(a),h.sort(a),i.sort(a),j.sort(a),b=0;b<7;b++)h[b]=aa(h[b]),i[b]=aa(i[b]),j[b]=aa(j[b]);this._weekdaysRegex=new RegExp("^("+j.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+i.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+h.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+g.join("|")+")","i")} +// FORMATTING +function Ra(){return this.hours()%12||12}function Sa(){return this.hours()||24}function Ta(a,b){U(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})} +// PARSING +function Ua(a,b){return b._meridiemParse} +// LOCALES +function Va(a){ +// IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays +// Using charAt should be more compatible. +return"p"===(a+"").toLowerCase().charAt(0)}function Wa(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Xa(a){return a?a.toLowerCase().replace("_","-"):a} +// pick the locale from the array +// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each +// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root +function Ya(a){for(var b,c,d,e,f=0;f0;){if(d=Za(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&v(e,c,!0)>=b-1) +//the next array item is better than a shallower substring of this one +break;b--}f++}return null}function Za(a){var b=null; +// TODO: Find a better way to register and load all the locales in Node +if(!Be[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=xe._abbr,require("./locale/"+a), +// because defineLocale currently also sets the global locale, we +// want to undo that for lazy loaded locales +$a(b)}catch(a){}return Be[a]} +// This function will load locale and then set the global locale. If +// no arguments are passed in, it will simply return the current global +// locale key. +function $a(a,b){var c; +// moment.duration._locale = moment._locale = data; +return a&&(c=p(b)?bb(a):_a(a,b),c&&(xe=c)),xe._abbr}function _a(a,b){if(null!==b){var c=Ae;if(b.abbr=a,null!=Be[a])y("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),c=Be[a]._config;else if(null!=b.parentLocale){if(null==Be[b.parentLocale])return Ce[b.parentLocale]||(Ce[b.parentLocale]=[]),Ce[b.parentLocale].push({name:a,config:b}),null;c=Be[b.parentLocale]._config} +// backwards compat for now: also set the locale +// make sure we set the locale AFTER all child locales have been +// created, so we won't end up with the child locale set. +return Be[a]=new C(B(c,b)),Ce[a]&&Ce[a].forEach(function(a){_a(a.name,a.config)}),$a(a),Be[a]} +// useful for testing +return delete Be[a],null}function ab(a,b){if(null!=b){var c,d=Ae; +// MERGE +null!=Be[a]&&(d=Be[a]._config),b=B(d,b),c=new C(b),c.parentLocale=Be[a],Be[a]=c, +// backwards compat for now: also set the locale +$a(a)}else +// pass null for config to unupdate, useful for tests +null!=Be[a]&&(null!=Be[a].parentLocale?Be[a]=Be[a].parentLocale:null!=Be[a]&&delete Be[a]);return Be[a]} +// returns locale data +function bb(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return xe;if(!c(a)){if( +//short-circuit everything else +b=Za(a))return b;a=[a]}return Ya(a)}function cb(){return wd(Be)}function db(a){var b,c=a._a;return c&&m(a).overflow===-2&&(b=c[be]<0||c[be]>11?be:c[ce]<1||c[ce]>ea(c[ae],c[be])?ce:c[de]<0||c[de]>24||24===c[de]&&(0!==c[ee]||0!==c[fe]||0!==c[ge])?de:c[ee]<0||c[ee]>59?ee:c[fe]<0||c[fe]>59?fe:c[ge]<0||c[ge]>999?ge:-1,m(a)._overflowDayOfYear&&(bce)&&(b=ce),m(a)._overflowWeeks&&b===-1&&(b=he),m(a)._overflowWeekday&&b===-1&&(b=ie),m(a).overflow=b),a} +// date from iso format +function eb(a){var b,c,d,e,f,g,h=a._i,i=De.exec(h)||Ee.exec(h);if(i){for(m(a).iso=!0,b=0,c=Ge.length;bpa(e)&&(m(a)._overflowDayOfYear=!0),c=ta(e,0,a._dayOfYear),a._a[be]=c.getUTCMonth(),a._a[ce]=c.getUTCDate()),b=0;b<3&&null==a._a[b];++b)a._a[b]=f[b]=d[b]; +// Zero out whatever was not defaulted, including time +for(;b<7;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b]; +// Check for 24:00:00.000 +24===a._a[de]&&0===a._a[ee]&&0===a._a[fe]&&0===a._a[ge]&&(a._nextDay=!0,a._a[de]=0),a._d=(a._useUTC?ta:sa).apply(null,f), +// Apply timezone offset from input. The actual utcOffset can be changed +// with parseZone. +null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[de]=24)}}function jb(a){var b,c,d,e,f,g,h,i;if(b=a._w,null!=b.GG||null!=b.W||null!=b.E)f=1,g=4, +// TODO: We need to take the current isoWeekYear, but that depends on +// how we interpret now (local, utc, fixed offset). So create +// a now version of current config (take local/utc/offset flags, and +// create now). +c=gb(b.GG,a._a[ae],wa(sb(),1,4).year),d=gb(b.W,1),e=gb(b.E,1),(e<1||e>7)&&(i=!0);else{f=a._locale._week.dow,g=a._locale._week.doy;var j=wa(sb(),f,g);c=gb(b.gg,a._a[ae],j.year), +// Default to current week. +d=gb(b.w,j.week),null!=b.d?( +// weekday -- low day numbers are considered next week +e=b.d,(e<0||e>6)&&(i=!0)):null!=b.e?( +// local weekday -- counting starts from begining of week +e=b.e+f,(b.e<0||b.e>6)&&(i=!0)): +// default to begining of week +e=f}d<1||d>xa(c,f,g)?m(a)._overflowWeeks=!0:null!=i?m(a)._overflowWeekday=!0:(h=va(c,d,e,f,g),a._a[ae]=h.year,a._dayOfYear=h.dayOfYear)} +// date from string and format string +function kb(b){ +// TODO: Move this to another part of the creation flow to prevent circular deps +if(b._f===a.ISO_8601)return void eb(b);b._a=[],m(b).empty=!0; +// This array is used to make a Date, either with `new Date` or `Date.UTC` +var c,d,e,f,g,h=""+b._i,i=h.length,j=0;for(e=Y(b._f,b._locale).match(Fd)||[],c=0;c0&&m(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),j+=d.length), +// don't parse if it's not a known token +Id[f]?(d?m(b).empty=!1:m(b).unusedTokens.push(f),da(f,d,b)):b._strict&&!d&&m(b).unusedTokens.push(f); +// add remaining unparsed input length to the string +m(b).charsLeftOver=i-j,h.length>0&&m(b).unusedInput.push(h), +// clear _12h flag if hour is <= 12 +b._a[de]<=12&&m(b).bigHour===!0&&b._a[de]>0&&(m(b).bigHour=void 0),m(b).parsedDateParts=b._a.slice(0),m(b).meridiem=b._meridiem, +// handle meridiem +b._a[de]=lb(b._locale,b._a[de],b._meridiem),ib(b),db(b)}function lb(a,b,c){var d; +// Fallback +return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&b<12&&(b+=12),d||12!==b||(b=0),b):b} +// date from string and array of format strings +function mb(a){var b,c,d,e,f;if(0===a._f.length)return m(a).invalidFormat=!0,void(a._d=new Date(NaN));for(e=0;e +// 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset +// +0200, so we adjust the time as needed, to be valid. +// +// Keeping the time actually adds/subtracts (one hour) +// from the actual represented time. That is why we call updateOffset +// a second time. In case it wants us to change the offset again +// _changeInProgress == true case, then we have to adjust, because +// there is no such time in the given timezone. +function Db(b,c){var d,e=this._offset||0;if(!this.isValid())return null!=b?this:NaN;if(null!=b){if("string"==typeof b){if(b=Ab(Xd,b),null===b)return this}else Math.abs(b)<16&&(b=60*b);return!this._isUTC&&c&&(d=Cb(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?Tb(this,Ob(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?e:Cb(this)}function Eb(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Fb(a){return this.utcOffset(0,a)}function Gb(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Cb(this),"m")),this}function Hb(){if(null!=this._tzm)this.utcOffset(this._tzm);else if("string"==typeof this._i){var a=Ab(Wd,this._i);null!=a?this.utcOffset(a):this.utcOffset(0,!0)}return this}function Ib(a){return!!this.isValid()&&(a=a?sb(a).utcOffset():0,(this.utcOffset()-a)%60===0)}function Jb(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Kb(){if(!p(this._isDSTShifted))return this._isDSTShifted;var a={};if(q(a,this),a=pb(a),a._a){var b=a._isUTC?k(a._a):sb(a._a);this._isDSTShifted=this.isValid()&&v(a._a,b.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function Lb(){return!!this.isValid()&&!this._isUTC}function Mb(){return!!this.isValid()&&this._isUTC}function Nb(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}function Ob(a,b){var c,d,e,g=a, +// matching against regexp is expensive, do it on demand +h=null;// checks for null or undefined +return xb(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:f(a)?(g={},b?g[b]=a:g.milliseconds=a):(h=Ne.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:u(h[ce])*c,h:u(h[de])*c,m:u(h[ee])*c,s:u(h[fe])*c,ms:u(yb(1e3*h[ge]))*c}):(h=Oe.exec(a))?(c="-"===h[1]?-1:1,g={y:Pb(h[2],c),M:Pb(h[3],c),w:Pb(h[4],c),d:Pb(h[5],c),h:Pb(h[6],c),m:Pb(h[7],c),s:Pb(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=Rb(sb(g.from),sb(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new wb(g),xb(a)&&i(a,"_locale")&&(d._locale=a._locale),d}function Pb(a,b){ +// We'd normally use ~~inp for this, but unfortunately it also +// converts floats to ints. +// inp may be undefined, so careful calling replace on it. +var c=a&&parseFloat(a.replace(",",".")); +// apply sign while we're at it +return(isNaN(c)?0:c)*b}function Qb(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function Rb(a,b){var c;return a.isValid()&&b.isValid()?(b=Bb(b,a),a.isBefore(b)?c=Qb(a,b):(c=Qb(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c):{milliseconds:0,months:0}} +// TODO: remove 'name' arg after deprecation is removed +function Sb(a,b){return function(c,d){var e,f; +//invert the arguments, but complain about it +return null===d||isNaN(+d)||(y(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Ob(c,d),Tb(this,e,a),this}}function Tb(b,c,d,e){var f=c._milliseconds,g=yb(c._days),h=yb(c._months);b.isValid()&&(e=null==e||e,f&&b._d.setTime(b._d.valueOf()+f*d),g&&Q(b,"Date",P(b,"Date")+g*d),h&&ja(b,P(b,"Month")+h*d),e&&a.updateOffset(b,g||h))}function Ub(a,b){var c=a.diff(b,"days",!0);return c<-6?"sameElse":c<-1?"lastWeek":c<0?"lastDay":c<1?"sameDay":c<2?"nextDay":c<7?"nextWeek":"sameElse"}function Vb(b,c){ +// We want to compare the start of today, vs this. +// Getting start-of-today depends on whether we're local/utc/offset or not. +var d=b||sb(),e=Bb(d,this).startOf("day"),f=a.calendarFormat(this,e)||"sameElse",g=c&&(z(c[f])?c[f].call(this,d):c[f]);return this.format(g||this.localeData().calendar(f,this,sb(d)))}function Wb(){return new r(this)}function Xb(a,b){var c=s(a)?a:sb(a);return!(!this.isValid()||!c.isValid())&&(b=K(p(b)?"millisecond":b),"millisecond"===b?this.valueOf()>c.valueOf():c.valueOf()f&&(b=f),Fc.call(this,a,b,c,d,e))}function Fc(a,b,c,d,e){var f=va(a,b,c,d,e),g=ta(f.year,0,f.dayOfYear);return this.year(g.getUTCFullYear()),this.month(g.getUTCMonth()),this.date(g.getUTCDate()),this} +// MOMENTS +function Gc(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)} +// HELPERS +// MOMENTS +function Hc(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function Ic(a,b){b[ge]=u(1e3*("0."+a))} +// MOMENTS +function Jc(){return this._isUTC?"UTC":""}function Kc(){return this._isUTC?"Coordinated Universal Time":""}function Lc(a){return sb(1e3*a)}function Mc(){return sb.apply(null,arguments).parseZone()}function Nc(a){return a}function Oc(a,b,c,d){var e=bb(),f=k().set(d,b);return e[c](f,a)}function Pc(a,b,c){if(f(a)&&(b=a,a=void 0),a=a||"",null!=b)return Oc(a,b,c,"month");var d,e=[];for(d=0;d<12;d++)e[d]=Oc(a,d,c,"month");return e} +// () +// (5) +// (fmt, 5) +// (fmt) +// (true) +// (true, 5) +// (true, fmt, 5) +// (true, fmt) +function Qc(a,b,c,d){"boolean"==typeof a?(f(b)&&(c=b,b=void 0),b=b||""):(b=a,c=b,a=!1,f(b)&&(c=b,b=void 0),b=b||"");var e=bb(),g=a?e._week.dow:0;if(null!=c)return Oc(b,(c+g)%7,d,"day");var h,i=[];for(h=0;h<7;h++)i[h]=Oc(b,(h+g)%7,d,"day");return i}function Rc(a,b){return Pc(a,b,"months")}function Sc(a,b){return Pc(a,b,"monthsShort")}function Tc(a,b,c){return Qc(a,b,c,"weekdays")}function Uc(a,b,c){return Qc(a,b,c,"weekdaysShort")}function Vc(a,b,c){return Qc(a,b,c,"weekdaysMin")}function Wc(){var a=this._data;return this._milliseconds=Ze(this._milliseconds),this._days=Ze(this._days),this._months=Ze(this._months),a.milliseconds=Ze(a.milliseconds),a.seconds=Ze(a.seconds),a.minutes=Ze(a.minutes),a.hours=Ze(a.hours),a.months=Ze(a.months),a.years=Ze(a.years),this}function Xc(a,b,c,d){var e=Ob(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()} +// supports only 2.0-style add(1, 's') or add(duration) +function Yc(a,b){return Xc(this,a,b,1)} +// supports only 2.0-style subtract(1, 's') or subtract(duration) +function Zc(a,b){return Xc(this,a,b,-1)}function $c(a){return a<0?Math.floor(a):Math.ceil(a)}function _c(){var a,b,c,d,e,f=this._milliseconds,g=this._days,h=this._months,i=this._data; +// if we have a mix of positive and negative values, bubble down first +// check: https://github.com/moment/moment/issues/2166 +// The following code bubbles up values, see the tests for +// examples of what that means. +// convert days to months +// 12 months -> 1 year +return f>=0&&g>=0&&h>=0||f<=0&&g<=0&&h<=0||(f+=864e5*$c(bd(h)+g),g=0,h=0),i.milliseconds=f%1e3,a=t(f/1e3),i.seconds=a%60,b=t(a/60),i.minutes=b%60,c=t(b/60),i.hours=c%24,g+=t(c/24),e=t(ad(g)),h+=e,g-=$c(bd(e)),d=t(h/12),h%=12,i.days=g,i.months=h,i.years=d,this}function ad(a){ +// 400 years have 146097 days (taking into account leap year rules) +// 400 years have 12 months === 4800 +return 4800*a/146097}function bd(a){ +// the reverse of daysToMonths +return 146097*a/4800}function cd(a){var b,c,d=this._milliseconds;if(a=K(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+ad(b),"month"===a?c:c/12;switch( +// handle milliseconds separately because of floating point math errors (issue #1867) +b=this._days+Math.round(bd(this._months)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3; +// Math.floor prevents floating point math errors here +case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}} +// TODO: Use this.as('ms')? +function dd(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*u(this._months/12)}function ed(a){return function(){return this.as(a)}}function fd(a){return a=K(a),this[a+"s"]()}function gd(a){return function(){return this._data[a]}}function hd(){return t(this.days()/7)} +// helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize +function id(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function jd(a,b,c){var d=Ob(a).abs(),e=of(d.as("s")),f=of(d.as("m")),g=of(d.as("h")),h=of(d.as("d")),i=of(d.as("M")),j=of(d.as("y")),k=e0,k[4]=c,id.apply(null,k)} +// This function allows you to set the rounding function for relative time strings +function kd(a){return void 0===a?of:"function"==typeof a&&(of=a,!0)} +// This function allows you to set a threshold for relative time strings +function ld(a,b){return void 0!==pf[a]&&(void 0===b?pf[a]:(pf[a]=b,!0))}function md(a){var b=this.localeData(),c=jd(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function nd(){ +// for ISO strings we do not use the normal bubbling rules: +// * milliseconds bubble up until they become hours +// * days do not bubble at all +// * months bubble up until they become years +// This is because there is no context-free conversion between hours and days +// (think of clock changes) +// and also not between days and months (28-31 days per month) +var a,b,c,d=qf(this._milliseconds)/1e3,e=qf(this._days),f=qf(this._months); +// 3600 seconds -> 60 minutes -> 1 hour +a=t(d/60),b=t(a/60),d%=60,a%=60, +// 12 months -> 1 year +c=t(f/12),f%=12; +// inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js +var g=c,h=f,i=e,j=b,k=a,l=d,m=this.asSeconds();return m?(m<0?"-":"")+"P"+(g?g+"Y":"")+(h?h+"M":"")+(i?i+"D":"")+(j||k||l?"T":"")+(j?j+"H":"")+(k?k+"M":"")+(l?l+"S":""):"P0D"}var od,pd;pd=Array.prototype.some?Array.prototype.some:function(a){for(var b=Object(this),c=b.length>>>0,d=0;d68?1900:2e3)}; +// MOMENTS +var pe=O("FullYear",!0); +// FORMATTING +U("w",["ww",2],"wo","week"),U("W",["WW",2],"Wo","isoWeek"), +// ALIASES +J("week","w"),J("isoWeek","W"), +// PRIORITIES +M("week",5),M("isoWeek",5), +// PARSING +Z("w",Od),Z("ww",Od,Kd),Z("W",Od),Z("WW",Od,Kd),ca(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=u(a)});var qe={dow:0,// Sunday is the first day of the week. +doy:6}; +// FORMATTING +U("d",0,"do","day"),U("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),U("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),U("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),U("e",0,0,"weekday"),U("E",0,0,"isoWeekday"), +// ALIASES +J("day","d"),J("weekday","e"),J("isoWeekday","E"), +// PRIORITY +M("day",11),M("weekday",11),M("isoWeekday",11), +// PARSING +Z("d",Od),Z("e",Od),Z("E",Od),Z("dd",function(a,b){return b.weekdaysMinRegex(a)}),Z("ddd",function(a,b){return b.weekdaysShortRegex(a)}),Z("dddd",function(a,b){return b.weekdaysRegex(a)}),ca(["dd","ddd","dddd"],function(a,b,c,d){var e=c._locale.weekdaysParse(a,d,c._strict); +// if we didn't get a weekday name, mark the date as invalid +null!=e?b.d=e:m(c).invalidWeekday=a}),ca(["d","e","E"],function(a,b,c,d){b[d]=u(a)}); +// LOCALES +var re="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),se="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),te="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ue=Zd,ve=Zd,we=Zd;U("H",["HH",2],0,"hour"),U("h",["hh",2],0,Ra),U("k",["kk",2],0,Sa),U("hmm",0,0,function(){return""+Ra.apply(this)+T(this.minutes(),2)}),U("hmmss",0,0,function(){return""+Ra.apply(this)+T(this.minutes(),2)+T(this.seconds(),2)}),U("Hmm",0,0,function(){return""+this.hours()+T(this.minutes(),2)}),U("Hmmss",0,0,function(){return""+this.hours()+T(this.minutes(),2)+T(this.seconds(),2)}),Ta("a",!0),Ta("A",!1), +// ALIASES +J("hour","h"), +// PRIORITY +M("hour",13),Z("a",Ua),Z("A",Ua),Z("H",Od),Z("h",Od),Z("HH",Od,Kd),Z("hh",Od,Kd),Z("hmm",Pd),Z("hmmss",Qd),Z("Hmm",Pd),Z("Hmmss",Qd),ba(["H","HH"],de),ba(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),ba(["h","hh"],function(a,b,c){b[de]=u(a),m(c).bigHour=!0}),ba("hmm",function(a,b,c){var d=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d)),m(c).bigHour=!0}),ba("hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d,2)),b[fe]=u(a.substr(e)),m(c).bigHour=!0}),ba("Hmm",function(a,b,c){var d=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d))}),ba("Hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d,2)),b[fe]=u(a.substr(e))});var xe,ye=/[ap]\.?m?\.?/i,ze=O("Hours",!0),Ae={calendar:xd,longDateFormat:yd,invalidDate:zd,ordinal:Ad,ordinalParse:Bd,relativeTime:Cd,months:le,monthsShort:me,week:qe,weekdays:re,weekdaysMin:te,weekdaysShort:se,meridiemParse:ye},Be={},Ce={},De=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Ee=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Fe=/Z|[+-]\d\d(?::?\d\d)?/,Ge=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/], +// YYYYMM is NOT allowed by the standard +["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],He=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Ie=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=x("value provided is not in a recognized ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}), +// constant that refers to the ISO standard +a.ISO_8601=function(){};var Je=x("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var a=sb.apply(null,arguments);return this.isValid()&&a.isValid()?athis?this:a:o()}),Le=function(){return Date.now?Date.now():+new Date};zb("Z",":"),zb("ZZ",""), +// PARSING +Z("Z",Xd),Z("ZZ",Xd),ba(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ab(Xd,a)}); +// HELPERS +// timezone chunker +// '+10:00' > ['10', '00'] +// '-1530' > ['-15', '30'] +var Me=/([\+\-]|\d\d)/gi; +// HOOKS +// This function will be called whenever a moment is mutated. +// It is intended to keep the offset in sync with the timezone. +a.updateOffset=function(){}; +// ASP.NET json date format regex +var Ne=/^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,Oe=/^(-)?P(?:(-?[0-9,.]*)Y)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)W)?(?:(-?[0-9,.]*)D)?(?:T(?:(-?[0-9,.]*)H)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)S)?)?$/;Ob.fn=wb.prototype;var Pe=Sb(1,"add"),Qe=Sb(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var Re=x("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)}); +// FORMATTING +U(0,["gg",2],0,function(){return this.weekYear()%100}),U(0,["GG",2],0,function(){return this.isoWeekYear()%100}),zc("gggg","weekYear"),zc("ggggg","weekYear"),zc("GGGG","isoWeekYear"),zc("GGGGG","isoWeekYear"), +// ALIASES +J("weekYear","gg"),J("isoWeekYear","GG"), +// PRIORITY +M("weekYear",1),M("isoWeekYear",1), +// PARSING +Z("G",Vd),Z("g",Vd),Z("GG",Od,Kd),Z("gg",Od,Kd),Z("GGGG",Sd,Md),Z("gggg",Sd,Md),Z("GGGGG",Td,Nd),Z("ggggg",Td,Nd),ca(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=u(a)}),ca(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}), +// FORMATTING +U("Q",0,"Qo","quarter"), +// ALIASES +J("quarter","Q"), +// PRIORITY +M("quarter",7), +// PARSING +Z("Q",Jd),ba("Q",function(a,b){b[be]=3*(u(a)-1)}), +// FORMATTING +U("D",["DD",2],"Do","date"), +// ALIASES +J("date","D"), +// PRIOROITY +M("date",9), +// PARSING +Z("D",Od),Z("DD",Od,Kd),Z("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),ba(["D","DD"],ce),ba("Do",function(a,b){b[ce]=u(a.match(Od)[0],10)}); +// MOMENTS +var Se=O("Date",!0); +// FORMATTING +U("DDD",["DDDD",3],"DDDo","dayOfYear"), +// ALIASES +J("dayOfYear","DDD"), +// PRIORITY +M("dayOfYear",4), +// PARSING +Z("DDD",Rd),Z("DDDD",Ld),ba(["DDD","DDDD"],function(a,b,c){c._dayOfYear=u(a)}), +// FORMATTING +U("m",["mm",2],0,"minute"), +// ALIASES +J("minute","m"), +// PRIORITY +M("minute",14), +// PARSING +Z("m",Od),Z("mm",Od,Kd),ba(["m","mm"],ee); +// MOMENTS +var Te=O("Minutes",!1); +// FORMATTING +U("s",["ss",2],0,"second"), +// ALIASES +J("second","s"), +// PRIORITY +M("second",15), +// PARSING +Z("s",Od),Z("ss",Od,Kd),ba(["s","ss"],fe); +// MOMENTS +var Ue=O("Seconds",!1); +// FORMATTING +U("S",0,0,function(){return~~(this.millisecond()/100)}),U(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),U(0,["SSS",3],0,"millisecond"),U(0,["SSSS",4],0,function(){return 10*this.millisecond()}),U(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),U(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),U(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),U(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),U(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}), +// ALIASES +J("millisecond","ms"), +// PRIORITY +M("millisecond",16), +// PARSING +Z("S",Rd,Jd),Z("SS",Rd,Kd),Z("SSS",Rd,Ld);var Ve;for(Ve="SSSS";Ve.length<=9;Ve+="S")Z(Ve,Ud);for(Ve="S";Ve.length<=9;Ve+="S")ba(Ve,Ic); +// MOMENTS +var We=O("Milliseconds",!1); +// FORMATTING +U("z",0,0,"zoneAbbr"),U("zz",0,0,"zoneName");var Xe=r.prototype;Xe.add=Pe,Xe.calendar=Vb,Xe.clone=Wb,Xe.diff=bc,Xe.endOf=oc,Xe.format=gc,Xe.from=hc,Xe.fromNow=ic,Xe.to=jc,Xe.toNow=kc,Xe.get=R,Xe.invalidAt=xc,Xe.isAfter=Xb,Xe.isBefore=Yb,Xe.isBetween=Zb,Xe.isSame=$b,Xe.isSameOrAfter=_b,Xe.isSameOrBefore=ac,Xe.isValid=vc,Xe.lang=Re,Xe.locale=lc,Xe.localeData=mc,Xe.max=Ke,Xe.min=Je,Xe.parsingFlags=wc,Xe.set=S,Xe.startOf=nc,Xe.subtract=Qe,Xe.toArray=sc,Xe.toObject=tc,Xe.toDate=rc,Xe.toISOString=ec,Xe.inspect=fc,Xe.toJSON=uc,Xe.toString=dc,Xe.unix=qc,Xe.valueOf=pc,Xe.creationData=yc, +// Year +Xe.year=pe,Xe.isLeapYear=ra, +// Week Year +Xe.weekYear=Ac,Xe.isoWeekYear=Bc, +// Quarter +Xe.quarter=Xe.quarters=Gc, +// Month +Xe.month=ka,Xe.daysInMonth=la, +// Week +Xe.week=Xe.weeks=Ba,Xe.isoWeek=Xe.isoWeeks=Ca,Xe.weeksInYear=Dc,Xe.isoWeeksInYear=Cc, +// Day +Xe.date=Se,Xe.day=Xe.days=Ka,Xe.weekday=La,Xe.isoWeekday=Ma,Xe.dayOfYear=Hc, +// Hour +Xe.hour=Xe.hours=ze, +// Minute +Xe.minute=Xe.minutes=Te, +// Second +Xe.second=Xe.seconds=Ue, +// Millisecond +Xe.millisecond=Xe.milliseconds=We, +// Offset +Xe.utcOffset=Db,Xe.utc=Fb,Xe.local=Gb,Xe.parseZone=Hb,Xe.hasAlignedHourOffset=Ib,Xe.isDST=Jb,Xe.isLocal=Lb,Xe.isUtcOffset=Mb,Xe.isUtc=Nb,Xe.isUTC=Nb, +// Timezone +Xe.zoneAbbr=Jc,Xe.zoneName=Kc, +// Deprecations +Xe.dates=x("dates accessor is deprecated. Use date instead.",Se),Xe.months=x("months accessor is deprecated. Use month instead",ka),Xe.years=x("years accessor is deprecated. Use year instead",pe),Xe.zone=x("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",Eb),Xe.isDSTShifted=x("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",Kb);var Ye=C.prototype;Ye.calendar=D,Ye.longDateFormat=E,Ye.invalidDate=F,Ye.ordinal=G,Ye.preparse=Nc,Ye.postformat=Nc,Ye.relativeTime=H,Ye.pastFuture=I,Ye.set=A, +// Month +Ye.months=fa,Ye.monthsShort=ga,Ye.monthsParse=ia,Ye.monthsRegex=na,Ye.monthsShortRegex=ma, +// Week +Ye.week=ya,Ye.firstDayOfYear=Aa,Ye.firstDayOfWeek=za, +// Day of Week +Ye.weekdays=Fa,Ye.weekdaysMin=Ha,Ye.weekdaysShort=Ga,Ye.weekdaysParse=Ja,Ye.weekdaysRegex=Na,Ye.weekdaysShortRegex=Oa,Ye.weekdaysMinRegex=Pa, +// Hours +Ye.isPM=Va,Ye.meridiem=Wa,$a("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===u(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}), +// Side effect imports +a.lang=x("moment.lang is deprecated. Use moment.locale instead.",$a),a.langData=x("moment.langData is deprecated. Use moment.localeData instead.",bb);var Ze=Math.abs,$e=ed("ms"),_e=ed("s"),af=ed("m"),bf=ed("h"),cf=ed("d"),df=ed("w"),ef=ed("M"),ff=ed("y"),gf=gd("milliseconds"),hf=gd("seconds"),jf=gd("minutes"),kf=gd("hours"),lf=gd("days"),mf=gd("months"),nf=gd("years"),of=Math.round,pf={s:45,// seconds to minute +m:45,// minutes to hour +h:22,// hours to day +d:26,// days to month +M:11},qf=Math.abs,rf=wb.prototype; +// Deprecations +// Side effect imports +// FORMATTING +// PARSING +// Side effect imports +return rf.abs=Wc,rf.add=Yc,rf.subtract=Zc,rf.as=cd,rf.asMilliseconds=$e,rf.asSeconds=_e,rf.asMinutes=af,rf.asHours=bf,rf.asDays=cf,rf.asWeeks=df,rf.asMonths=ef,rf.asYears=ff,rf.valueOf=dd,rf._bubble=_c,rf.get=fd,rf.milliseconds=gf,rf.seconds=hf,rf.minutes=jf,rf.hours=kf,rf.days=lf,rf.weeks=hd,rf.months=mf,rf.years=nf,rf.humanize=md,rf.toISOString=nd,rf.toString=nd,rf.toJSON=nd,rf.locale=lc,rf.localeData=mc,rf.toIsoString=x("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",nd),rf.lang=Re,U("X",0,0,"unix"),U("x",0,0,"valueOf"),Z("x",Vd),Z("X",Yd),ba("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),ba("x",function(a,b,c){c._d=new Date(u(a))}),a.version="2.17.1",b(sb),a.fn=Xe,a.min=ub,a.max=vb,a.now=Le,a.utc=k,a.unix=Lc,a.months=Rc,a.isDate=g,a.locale=$a,a.invalid=o,a.duration=Ob,a.isMoment=s,a.weekdays=Tc,a.parseZone=Mc,a.localeData=bb,a.isDuration=xb,a.monthsShort=Sc,a.weekdaysMin=Vc,a.defineLocale=_a,a.updateLocale=ab,a.locales=cb,a.weekdaysShort=Uc,a.normalizeUnits=K,a.relativeTimeRounding=kd,a.relativeTimeThreshold=ld,a.calendarFormat=Ub,a.prototype=Xe,a}); \ No newline at end of file diff --git a/settings.php b/settings.php index 01172d50..99f96aaf 100644 --- a/settings.php +++ b/settings.php @@ -625,24 +625,6 @@ $privacyMode = false; } - if(istrue($setupVars["API_GET_UPSTREAM_DNS_HOSTNAME"])) - { - $resolveForward = true; - } - else - { - $resolveForward = false; - } - - if(istrue($setupVars["API_GET_CLIENT_HOSTNAME"])) - { - $resolveClients = true; - } - else - { - $resolveClients = false; - } - ?>
    @@ -661,36 +643,24 @@
    - +
    -

    Reverse DNS lookup

    -

    Try to determine the domain name via querying the Pi-hole for

    +

    Privacy settings (Statistics / Query Log)

    -
    +
    -
    -
    -
    -

    Query Log

    -
    -
    -
    -
    -
    -
    -
    -
    +

    Privacy mode

    -
    +
    @@ -766,6 +736,35 @@
    */ ?> + +
    +
    +

    FTL status (Running, PID: Not running)

    +
    +
    + Time FTL started:
    + User / Group: /
    + Total CPU utilization: %
    + Total CPU time:
    + Memory utilization: %
    + Used memory:
    + +
    +

    System Administration

    From f88092175e150df4243ff507bf6aed9bd3f7f9a9 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 19 Feb 2017 14:17:52 +0100 Subject: [PATCH 019/132] Conflicts: api.php scripts/pi-hole/php/FTL.php scripts/pi-hole/php/auth.php scripts/pi-hole/php/password.php --- api.php | 400 +++++++++++++-------------- scripts/pi-hole/js/footer.js | 126 ++++++--- scripts/pi-hole/php/FTL.php | 7 + scripts/pi-hole/php/auth.php | 3 +- scripts/pi-hole/php/data.php | 14 +- scripts/pi-hole/php/footer.php | 32 ++- scripts/pi-hole/php/header.php | 7 +- scripts/pi-hole/php/password.php | 3 +- scripts/pi-hole/php/savesettings.php | 4 +- 9 files changed, 347 insertions(+), 249 deletions(-) diff --git a/api.php b/api.php index b8e0024c..128640f8 100644 --- a/api.php +++ b/api.php @@ -1,242 +1,242 @@ - - $domains_over_time, - 'ads_over_time' => $ads_over_time); - $data = array_merge($data, $result); - } - - if (isset($_GET['topItems']) && $auth) - { - if(is_numeric($_GET['topItems'])) - { - sendRequestFTL("top-domains ".$_GET['topItems']); - } else { - sendRequestFTL("top-domains"); + $stats[$tmp[0]] = $tmp[1]; } + } + $data = array_merge($data,$stats); +} - $return = getResponseFTL(); - $top_queries = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - $top_queries[$tmp[2]] = $tmp[1]; - } +if (isset($_GET['overTimeData10mins'])) +{ + sendRequestFTL("overTime"); + $return = getResponseFTL(); - if(is_numeric($_GET['topItems'])) + $domains_over_time = array(); + $ads_over_time = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $domains_over_time[$tmp[0]] = $tmp[1]; + $ads_over_time[$tmp[0]] = $tmp[2]; + } + $result = array('domains_over_time' => $domains_over_time, + 'ads_over_time' => $ads_over_time); + $data = array_merge($data, $result); +} + +if (isset($_GET['topItems']) && $auth) +{ + if(is_numeric($_GET['topItems'])) + { + sendRequestFTL("top-domains ".$_GET['topItems']); + } + else + { + sendRequestFTL("top-domains"); + } + + $return = getResponseFTL(); + $top_queries = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $top_queries[$tmp[2]] = $tmp[1]; + } + + if(is_numeric($_GET['topItems'])) + { + sendRequestFTL("top-ads ".$_GET['topItems']); + } + else + { + sendRequestFTL("top-ads"); + } + + $return = getResponseFTL(); + $top_ads = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $top_ads[$tmp[2]] = $tmp[1]; + } + + $result = array('top_queries' => $top_queries, + 'top_ads' => $top_ads); + + $data = array_merge($data, $result); +} + +if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) +{ + sendRequestFTL("top-clients"); + $return = getResponseFTL(); + $top_clients = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + if(count($tmp) == 4) { - sendRequestFTL("top-ads ".$_GET['topItems']); + $top_clients[$tmp[3]."|".$tmp[2]] = $tmp[1]; } else { - sendRequestFTL("top-ads"); + $top_clients[$tmp[2]] = $tmp[1]; } - - $return = getResponseFTL(); - $top_ads = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - $top_ads[$tmp[2]] = $tmp[1]; - } - - $result = array('top_queries' => $top_queries, - 'top_ads' => $top_ads); - - $data = array_merge($data, $result); } - if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) + $result = array('top_sources' => $top_clients); + $data = array_merge($data, $result); +} + +if (isset($_GET['getForwardDestinations']) && $auth) +{ + sendRequestFTL("forward-dest"); + $return = getResponseFTL(); + $forward_dest = array(); + foreach($return as $line) { - sendRequestFTL("top-clients"); - $return = getResponseFTL(); - $top_clients = array(); - foreach($return as $line) + $tmp = explode(" ",$line); + if(count($tmp) == 4) { - $tmp = explode(" ",$line); - if(count($tmp) == 4) - { - $top_clients[$tmp[3]."|".$tmp[2]] = $tmp[1]; - } - else - { - $top_clients[$tmp[2]] = $tmp[1]; - } - } - - $result = array('top_sources' => $top_clients); - $data = array_merge($data, $result); - } - - if (isset($_GET['getForwardDestinations']) && $auth) - { - sendRequestFTL("forward-dest"); - $return = getResponseFTL(); - $forward_dest = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - if(count($tmp) == 4) - { - $forward_dest[$tmp[3]."|".$tmp[2]] = $tmp[1]; - } - else - { - $forward_dest[$tmp[2]] = $tmp[1]; - } - } - - $result = array('forward_destinations' => $forward_dest); - $data = array_merge($data, $result); - } - - if (isset($_GET['getQueryTypes']) && $auth) - { - sendRequestFTL("querytypes"); - $return = getResponseFTL(); - $querytypes = array(); - foreach($return as $ret) - { - $tmp = explode(": ",$ret); - $querytypes[$tmp[0]] = $tmp[1]; - } - - $result = array('querytypes' => $querytypes); - $data = array_merge($data, $result); - } - - if (isset($_GET['getAllQueries']) && $auth) - { - if(isset($_GET['from']) && isset($_GET['until'])) - { - // Get limited time interval - sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']); - } - else if(isset($_GET['domain'])) - { - // Get specific domain only - sendRequestFTL("getallqueries-domain ".$_GET['domain']); - } - else if(isset($_GET['client'])) - { - // Get specific client only - sendRequestFTL("getallqueries-client ".$_GET['client']); + $forward_dest[$tmp[3]."|".$tmp[2]] = $tmp[1]; } else { - // Get all queries - sendRequestFTL("getallqueries"); + $forward_dest[$tmp[2]] = $tmp[1]; } - $return = getResponseFTL(); - $allQueries = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - array_push($allQueries,$tmp); - } - - $result = array('data' => $allQueries); - $data = array_merge($data, $result); } - if (isset($_GET['enable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - exec('sudo pihole enable'); - $data = array_merge($data, array("status" => "enabled")); - } - elseif (isset($_GET['disable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - $disable = intval($_GET['disable']); - // intval returns the integer value on success, or 0 on failure - if($disable > 0) - { - exec("sudo pihole disable ".$disable."s"); - } - else - { - exec('sudo pihole disable'); - } - $data = array_merge($data, array("status" => "disabled")); - } + $result = array('forward_destinations' => $forward_dest); + $data = array_merge($data, $result); +} - if(isset($_GET["recentBlocked"])) +if (isset($_GET['getQueryTypes']) && $auth) +{ + sendRequestFTL("querytypes"); + $return = getResponseFTL(); + $querytypes = array(); + foreach($return as $ret) { - sendRequestFTL("recentBlocked"); - echo getResponseFTL()[0]; - unset($data); + $tmp = explode(": ",$ret); + $querytypes[$tmp[0]] = $tmp[1]; } - if(isset($data)) + $result = array('querytypes' => $querytypes); + $data = array_merge($data, $result); +} + +if (isset($_GET['getAllQueries']) && $auth) +{ + if(isset($_GET['from']) && isset($_GET['until'])) { - echo json_encode($data); + // Get limited time interval + sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']); + } + else if(isset($_GET['domain'])) + { + // Get specific domain only + sendRequestFTL("getallqueries-domain ".$_GET['domain']); + } + else if(isset($_GET['client'])) + { + // Get specific client only + sendRequestFTL("getallqueries-client ".$_GET['client']); + } + else + { + // Get all queries + sendRequestFTL("getallqueries"); + } + $return = getResponseFTL(); + $allQueries = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + array_push($allQueries,$tmp); } - disconnectFTL(); + $result = array('data' => $allQueries); + $data = array_merge($data, $result); +} + +if (isset($_GET['enable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + exec('sudo pihole enable'); + $data = array_merge($data, array("status" => "enabled")); +} +elseif (isset($_GET['disable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + $disable = intval($_GET['disable']); + // intval returns the integer value on success, or 0 on failure + if($disable > 0) + { + exec("sudo pihole disable ".$disable."s"); + } + else + { + exec('sudo pihole disable'); + } + $data = array_merge($data, array("status" => "disabled")); +} + +if(isset($_GET["recentBlocked"])) +{ + sendRequestFTL("recentBlocked"); + echo getResponseFTL()[0]; + unset($data); +} + +if(isset($data)) +{ + echo json_encode($data); +} + +disconnectFTL(); ?> diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 5cdd042e..3af5b3e7 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -22,17 +22,17 @@ function piholeChanged(action) switch(action) { case "enabled": - status.html(" Active"); - ena.hide(); - dis.show(); - dis.removeClass("active"); - break; + status.html(" Active"); + ena.hide(); + dis.show(); + dis.removeClass("active"); + break; case "disabled": - status.html(" Offline"); - ena.show(); - dis.hide(); - break; + status.html(" Offline"); + ena.show(); + dis.hide(); + break; } } @@ -44,32 +44,76 @@ function piholeChange(action, duration) switch(action) { case "enable": - btnStatus = $("#flip-status-enable"); - btnStatus.html(""); - $.getJSON("api.php?enable&token=" + token, function(data) { - if(data.status === "enabled") { - btnStatus.html(""); - piholeChanged("enabled"); - } - }); - break; + btnStatus = $("#flip-status-enable"); + btnStatus.html(""); + $.getJSON("api.php?enable&token=" + token, function(data) { + if(data.status === "enabled") { + btnStatus.html(""); + piholeChanged("enabled"); + } + }); + break; case "disable": - btnStatus = $("#flip-status-disable"); - btnStatus.html(""); - $.getJSON("api.php?disable=" + duration + "&token=" + token, function(data) { - if(data.status === "disabled") { - btnStatus.html(""); - piholeChanged("disabled"); - } - }); - break; + btnStatus = $("#flip-status-disable"); + btnStatus.html(""); + $.getJSON("api.php?disable=" + duration + "&token=" + token, function(data) { + if(data.status === "disabled") { + btnStatus.html(""); + piholeChanged("disabled"); + } + }); + break; } } +//The following three functions allow us to display time until pi-hole is enabled after disabling. +//Works between all pages + + +function setCountdownTarget(seconds){ + var target = new Date(); + target = new Date(target.getTime() + seconds * 1000); + localStorage.setItem("countDownTarget", target); +} + +function secondsTimeSpanToHMS(s) { + var h = Math.floor(s/3600); //Get whole hours + s -= h*3600; + var m = Math.floor(s/60); //Get remaining minutes + s -= m*60; + return h+":"+(m < 10 ? "0"+m : m)+":"+(s < 10 ? "0"+s : s); //zero padding on minutes and seconds +} + +function countDown(){ + var ena = $("#enableLabel"); + var target = new Date(localStorage.getItem("countDownTarget")); + var seconds = Math.round((target.getTime() - new Date().getTime()) / 1000); + + if(seconds > 0){ + setTimeout(countDown,1000); + ena.text("Enable (" + secondsTimeSpanToHMS(seconds) + ")"); + } + else + { + ena.text("Enable"); + piholeChanged("enabled"); + localStorage.removeItem("countDownTarget"); + } +} + +$( document ).ready(function() { + var countDownTarget = localStorage.getItem("countDownTarget"); + if (countDownTarget != null) + { + setTimeout(countDown,1000); + } +}); + // Handle Enable/Disable $("#pihole-enable").on("click", function(e){ e.preventDefault(); + localStorage.removeItem("countDownTarget"); piholeChange("enable",""); }); $("#pihole-disable-permanently").on("click", function(e){ @@ -79,18 +123,30 @@ $("#pihole-disable-permanently").on("click", function(e){ $("#pihole-disable-10s").on("click", function(e){ e.preventDefault(); piholeChange("disable","10"); - setTimeout(function(){piholeChanged("enabled");},10000); + setCountdownTarget(10); + setTimeout(countDown,1000); }); $("#pihole-disable-30s").on("click", function(e){ e.preventDefault(); piholeChange("disable","30"); - setTimeout(function(){piholeChanged("enabled");},30000); + setCountdownTarget(30); + setTimeout(countDown,1000); }); $("#pihole-disable-5m").on("click", function(e){ e.preventDefault(); piholeChange("disable","300"); - setTimeout(function(){piholeChanged("enabled");},300000); + setCountdownTarget(300); + setTimeout(countDown,1000); }); +$("#pihole-disable-custom").on("click", function(e){ + e.preventDefault(); + var custVal = $("#customTimeout").val(); + custVal = $("#btnMins").hasClass("active") ? custVal * 60 : custVal; + piholeChange("disable",custVal); + setCountdownTarget(custVal); + setTimeout(countDown,1000); +}); + var piholeVersion = $("#piholeVersion").html(); var webVersion = $("#webVersion").html(); @@ -200,15 +256,15 @@ else // Hide "exact match" button on queryads.php page if version is 2.9.5 or lower if(versionCompare(piholeVersion, "v2.9.5") < 1) { - $("#btnSearchExact").hide(); + $("#btnSearchExact").hide(); } // Handle Strg + Enter button on Login page $(document).keypress(function(e) { - if((e.keyCode === 10 || e.keyCode === 13) && e.ctrlKey && $("#loginpw").is(":focus")) { - $("#loginform").attr("action", "settings.php"); - $("#loginform").submit(); - } + if((e.keyCode === 10 || e.keyCode === 13) && e.ctrlKey && $("#loginpw").is(":focus")) { + $("#loginform").attr("action", "settings.php"); + $("#loginform").submit(); + } }); function testCookies() diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php index 91cffdd2..c483ecba 100644 --- a/scripts/pi-hole/php/FTL.php +++ b/scripts/pi-hole/php/FTL.php @@ -1,4 +1,10 @@ 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. */ -format('Y-m-d\TH:i:s')] = $status; + $allQueries['data'][hasHostName($client)][$domain][$time->format('Y-m-d T H:i:s')] = $status; }elseif ($orderBy == "orderByClientTimeDomain"){ - $allQueries['data'][hasHostName($client)][$time->format('Y-m-d\TH:i:s')][$domain] = $status; + $allQueries['data'][hasHostName($client)][$time->format('Y-m-d T H:i:s')][$domain] = $status; }elseif ($orderBy == "orderByTimeClientDomain"){ - $allQueries['data'][$time->format('Y-m-d\TH:i:s')][hasHostName($client)][$domain] = $status; + $allQueries['data'][$time->format('Y-m-d T H:i:s')][hasHostName($client)][$domain] = $status; }elseif ($orderBy == "orderByTimeDomainClient"){ - $allQueries['data'][$time->format('Y-m-d\TH:i:s')][$domain][hasHostName($client)] = $status; + $allQueries['data'][$time->format('Y-m-d T H:i:s')][$domain][hasHostName($client)] = $status; }elseif ($orderBy == "orderByDomainClientTime"){ - $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d\TH:i:s')] = $status; + $allQueries['data'][$domain][hasHostName($client)][$time->format('Y-m-d T H:i:s')] = $status; }elseif ($orderBy == "orderByDomainTimeClient"){ - $allQueries['data'][$domain][$time->format('Y-m-d\TH:i:s')][hasHostName($client)] = $status; + $allQueries['data'][$domain][$time->format('Y-m-d T H:i:s')][hasHostName($client)] = $status; }else{ array_push($allQueries['data'], array( - $time->format('Y-m-d\TH:i:s'), + $time->format('Y-m-d T H:i:s'), $type, $domain, hasHostName($client), diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index 1633420b..34d7319f 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -9,6 +9,36 @@
    + +
    Pi-hole Version Web Interface Version
    -
    Donate if you found this useful.
    +
    Donate if you found this useful.
    diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 009d0892..e885f1f4 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -419,11 +419,16 @@ For 5 minutes +
  • + + Custom time + +
  • hidden="true"> - Enable    + Enable   
  • active"> 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. */ - "Level3 (Primary)", "199.85.126.10" => "Norton (Primary)", "8.26.56.26" => "Comodo (Primary)", + "84.200.69.80" => "DNS.WATCH (Primary)", "8.8.4.4" => "Google (Secondary)", "208.67.220.220" => "OpenDNS (Secondary)", "4.2.2.2" => "Level3 (Secondary)", "199.85.127.10" => "Norton (Secondary)", - "8.20.247.20" => "Comodo (Secondary)" + "8.20.247.20" => "Comodo (Secondary)", + "84.200.70.40" => "DNS.WATCH (Secondary)", ]; $error = ""; From bbab9f8bfd6616c773597e186c78b61ad7e463b4 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 19 Feb 2017 14:24:23 +0100 Subject: [PATCH 020/132] Removed double license header in api.php --- api.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/api.php b/api.php index a2c81815..128640f8 100644 --- a/api.php +++ b/api.php @@ -1,9 +1,3 @@ - Date: Sun, 19 Feb 2017 14:26:59 +0100 Subject: [PATCH 021/132] Include missing license header in api_PHP.php --- api_PHP.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/api_PHP.php b/api_PHP.php index 589ae0bd..eea77080 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -1,4 +1,11 @@ Date: Sun, 19 Feb 2017 14:50:04 +0100 Subject: [PATCH 022/132] Ensure fallback solution works for all emelemts on the main page --- scripts/pi-hole/js/index.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 7c0dc79a..9bd1401a 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -106,7 +106,11 @@ function updateQueryTypes() { $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); }); var v = [], c = [], k = []; // Collect values and colors, and labels - $.each(data.querytypes, function(key , value) { + if(data.hasOwnProperty("querytypes")) + iter = data.querytypes; + else + iter = data; + $.each(iter, function(key , value) { v.push(value); c.push(colors.shift()); k.push(key); @@ -183,9 +187,13 @@ function updateForwardDestinations() { var colors = []; // Get colors from AdminLTE $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); }); - var v = [], c = [], k = []; + var v = [], c = [], k = [], iter; // Collect values and colors, immediately push individual labels - $.each(data.forward_destinations, function(key , value) { + if(data.hasOwnProperty("forward_destinations")) + iter = data.forward_destinations; + else + iter = data; + $.each(iter, function(key , value) { v.push(value); c.push(colors.shift()); if(key.indexOf("|") > -1) From 1975c261d05f04251772d3fa96891c298e4f8fcf Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 19 Feb 2017 14:52:28 +0100 Subject: [PATCH 023/132] Moved FTL API into own file as well --- api.php | 232 ++------------------------------------------------- api_FTL.php | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 227 deletions(-) create mode 100644 api_FTL.php diff --git a/api.php b/api.php index 128640f8..6683a2e7 100644 --- a/api.php +++ b/api.php @@ -9,234 +9,12 @@ $api = true; require("scripts/pi-hole/php/FTL.php"); -if(!testFTL()) +if(testFTL()) +{ + require("api_FTL.php"); +} +else { require("api_PHP.php"); - exit(); } - -require "scripts/pi-hole/php/password.php"; -require "scripts/pi-hole/php/auth.php"; - -check_cors(); -$socket = connectFTL("127.0.0.1"); -header('Content-type: application/json'); - -$data = []; - -if (isset($_GET['summary']) || isset($_GET['summaryRaw'])) -{ - sendRequestFTL("stats"); - $return = getResponseFTL(); - - $stats = []; - foreach($return as $line) - { - $tmp = explode(" ",$line); - - if(isset($_GET['summary'])) - { - if($tmp[0] !== "ads_percentage_today") - { - $stats[$tmp[0]] = number_format($tmp[1]); - } - else - { - $stats[$tmp[0]] = number_format($tmp[1], 1, '.', ''); - } - } - else - { - $stats[$tmp[0]] = $tmp[1]; - } - } - $data = array_merge($data,$stats); -} - -if (isset($_GET['overTimeData10mins'])) -{ - sendRequestFTL("overTime"); - $return = getResponseFTL(); - - $domains_over_time = array(); - $ads_over_time = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - $domains_over_time[$tmp[0]] = $tmp[1]; - $ads_over_time[$tmp[0]] = $tmp[2]; - } - $result = array('domains_over_time' => $domains_over_time, - 'ads_over_time' => $ads_over_time); - $data = array_merge($data, $result); -} - -if (isset($_GET['topItems']) && $auth) -{ - if(is_numeric($_GET['topItems'])) - { - sendRequestFTL("top-domains ".$_GET['topItems']); - } - else - { - sendRequestFTL("top-domains"); - } - - $return = getResponseFTL(); - $top_queries = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - $top_queries[$tmp[2]] = $tmp[1]; - } - - if(is_numeric($_GET['topItems'])) - { - sendRequestFTL("top-ads ".$_GET['topItems']); - } - else - { - sendRequestFTL("top-ads"); - } - - $return = getResponseFTL(); - $top_ads = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - $top_ads[$tmp[2]] = $tmp[1]; - } - - $result = array('top_queries' => $top_queries, - 'top_ads' => $top_ads); - - $data = array_merge($data, $result); -} - -if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) -{ - sendRequestFTL("top-clients"); - $return = getResponseFTL(); - $top_clients = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - if(count($tmp) == 4) - { - $top_clients[$tmp[3]."|".$tmp[2]] = $tmp[1]; - } - else - { - $top_clients[$tmp[2]] = $tmp[1]; - } - } - - $result = array('top_sources' => $top_clients); - $data = array_merge($data, $result); -} - -if (isset($_GET['getForwardDestinations']) && $auth) -{ - sendRequestFTL("forward-dest"); - $return = getResponseFTL(); - $forward_dest = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - if(count($tmp) == 4) - { - $forward_dest[$tmp[3]."|".$tmp[2]] = $tmp[1]; - } - else - { - $forward_dest[$tmp[2]] = $tmp[1]; - } - } - - $result = array('forward_destinations' => $forward_dest); - $data = array_merge($data, $result); -} - -if (isset($_GET['getQueryTypes']) && $auth) -{ - sendRequestFTL("querytypes"); - $return = getResponseFTL(); - $querytypes = array(); - foreach($return as $ret) - { - $tmp = explode(": ",$ret); - $querytypes[$tmp[0]] = $tmp[1]; - } - - $result = array('querytypes' => $querytypes); - $data = array_merge($data, $result); -} - -if (isset($_GET['getAllQueries']) && $auth) -{ - if(isset($_GET['from']) && isset($_GET['until'])) - { - // Get limited time interval - sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']); - } - else if(isset($_GET['domain'])) - { - // Get specific domain only - sendRequestFTL("getallqueries-domain ".$_GET['domain']); - } - else if(isset($_GET['client'])) - { - // Get specific client only - sendRequestFTL("getallqueries-client ".$_GET['client']); - } - else - { - // Get all queries - sendRequestFTL("getallqueries"); - } - $return = getResponseFTL(); - $allQueries = array(); - foreach($return as $line) - { - $tmp = explode(" ",$line); - array_push($allQueries,$tmp); - } - - $result = array('data' => $allQueries); - $data = array_merge($data, $result); -} - -if (isset($_GET['enable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - exec('sudo pihole enable'); - $data = array_merge($data, array("status" => "enabled")); -} -elseif (isset($_GET['disable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - $disable = intval($_GET['disable']); - // intval returns the integer value on success, or 0 on failure - if($disable > 0) - { - exec("sudo pihole disable ".$disable."s"); - } - else - { - exec('sudo pihole disable'); - } - $data = array_merge($data, array("status" => "disabled")); -} - -if(isset($_GET["recentBlocked"])) -{ - sendRequestFTL("recentBlocked"); - echo getResponseFTL()[0]; - unset($data); -} - -if(isset($data)) -{ - echo json_encode($data); -} - -disconnectFTL(); ?> diff --git a/api_FTL.php b/api_FTL.php new file mode 100644 index 00000000..045c3978 --- /dev/null +++ b/api_FTL.php @@ -0,0 +1,233 @@ + $domains_over_time, + 'ads_over_time' => $ads_over_time); + $data = array_merge($data, $result); +} + +if (isset($_GET['topItems']) && $auth) +{ + if(is_numeric($_GET['topItems'])) + { + sendRequestFTL("top-domains ".$_GET['topItems']); + } + else + { + sendRequestFTL("top-domains"); + } + + $return = getResponseFTL(); + $top_queries = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $top_queries[$tmp[2]] = $tmp[1]; + } + + if(is_numeric($_GET['topItems'])) + { + sendRequestFTL("top-ads ".$_GET['topItems']); + } + else + { + sendRequestFTL("top-ads"); + } + + $return = getResponseFTL(); + $top_ads = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + $top_ads[$tmp[2]] = $tmp[1]; + } + + $result = array('top_queries' => $top_queries, + 'top_ads' => $top_ads); + + $data = array_merge($data, $result); +} + +if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) +{ + sendRequestFTL("top-clients"); + $return = getResponseFTL(); + $top_clients = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + if(count($tmp) == 4) + { + $top_clients[$tmp[3]."|".$tmp[2]] = $tmp[1]; + } + else + { + $top_clients[$tmp[2]] = $tmp[1]; + } + } + + $result = array('top_sources' => $top_clients); + $data = array_merge($data, $result); +} + +if (isset($_GET['getForwardDestinations']) && $auth) +{ + sendRequestFTL("forward-dest"); + $return = getResponseFTL(); + $forward_dest = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + if(count($tmp) == 4) + { + $forward_dest[$tmp[3]."|".$tmp[2]] = $tmp[1]; + } + else + { + $forward_dest[$tmp[2]] = $tmp[1]; + } + } + + $result = array('forward_destinations' => $forward_dest); + $data = array_merge($data, $result); +} + +if (isset($_GET['getQueryTypes']) && $auth) +{ + sendRequestFTL("querytypes"); + $return = getResponseFTL(); + $querytypes = array(); + foreach($return as $ret) + { + $tmp = explode(": ",$ret); + $querytypes[$tmp[0]] = $tmp[1]; + } + + $result = array('querytypes' => $querytypes); + $data = array_merge($data, $result); +} + +if (isset($_GET['getAllQueries']) && $auth) +{ + if(isset($_GET['from']) && isset($_GET['until'])) + { + // Get limited time interval + sendRequestFTL("getallqueries-time ".$_GET['from']." ".$_GET['until']); + } + else if(isset($_GET['domain'])) + { + // Get specific domain only + sendRequestFTL("getallqueries-domain ".$_GET['domain']); + } + else if(isset($_GET['client'])) + { + // Get specific client only + sendRequestFTL("getallqueries-client ".$_GET['client']); + } + else + { + // Get all queries + sendRequestFTL("getallqueries"); + } + $return = getResponseFTL(); + $allQueries = array(); + foreach($return as $line) + { + $tmp = explode(" ",$line); + array_push($allQueries,$tmp); + } + + $result = array('data' => $allQueries); + $data = array_merge($data, $result); +} + +if (isset($_GET['enable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + exec('sudo pihole enable'); + $data = array_merge($data, array("status" => "enabled")); +} +elseif (isset($_GET['disable'], $_GET['token']) && $auth) { + check_csrf($_GET['token']); + $disable = intval($_GET['disable']); + // intval returns the integer value on success, or 0 on failure + if($disable > 0) + { + exec("sudo pihole disable ".$disable."s"); + } + else + { + exec('sudo pihole disable'); + } + $data = array_merge($data, array("status" => "disabled")); +} + +if(isset($_GET["recentBlocked"])) +{ + sendRequestFTL("recentBlocked"); + echo getResponseFTL()[0]; + unset($data); +} + +if(isset($data)) +{ + echo json_encode($data); +} + +disconnectFTL(); +?> From 91c563692e84650e64e7722d9fe480eb5ef4690e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 19 Feb 2017 14:58:20 +0100 Subject: [PATCH 024/132] Codacy --- scripts/pi-hole/js/index.js | 8 ++++++++ scripts/pi-hole/js/queries.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 9bd1401a..002fec42 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -107,9 +107,13 @@ function updateQueryTypes() { var v = [], c = [], k = []; // Collect values and colors, and labels if(data.hasOwnProperty("querytypes")) + { iter = data.querytypes; + } else + { iter = data; + } $.each(iter, function(key , value) { v.push(value); c.push(colors.shift()); @@ -190,9 +194,13 @@ function updateForwardDestinations() { var v = [], c = [], k = [], iter; // Collect values and colors, immediately push individual labels if(data.hasOwnProperty("forward_destinations")) + { iter = data.forward_destinations; + } else + { iter = data; + } $.each(iter, function(key , value) { v.push(value); c.push(colors.shift()); diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index f5abc74e..073ed50a 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -89,7 +89,7 @@ function handleAjaxError( xhr, textStatus, error ) { } else { - alert( "An unknown error occured while loading the data." ); + alert( "An unknown error occured while loading the data.\n"+xhr.responseText ); } $("#all-queries_processing").hide(); tableApi.clear(); From 8a0839f4398b057a20de499dba5afe683a8636fa Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 19 Feb 2017 19:05:06 +0100 Subject: [PATCH 025/132] Small security update to the indicidual API files --- api_FTL.php | 6 ++++++ api_PHP.php | 7 ++++++- scripts/pi-hole/js/index.js | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index 045c3978..6711d545 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -6,6 +6,12 @@ * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license */ + +if(!isset($api)) +{ + die("Direct call to api_FTL.php is not allowed!"); +} + require "scripts/pi-hole/php/password.php"; require "scripts/pi-hole/php/auth.php"; diff --git a/api_PHP.php b/api_PHP.php index eea77080..f8f65876 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -6,7 +6,12 @@ * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ - $api = true; + + if(!isset($api)) + { + die("Direct call to api_PHP.php is not allowed!"); + } + require "scripts/pi-hole/php/password.php"; require "scripts/pi-hole/php/auth.php"; diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 002fec42..e9226731 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -104,7 +104,7 @@ function updateQueryTypes() { var colors = []; // Get colors from AdminLTE $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); }); - var v = [], c = [], k = []; + var v = [], c = [], k = [], iter; // Collect values and colors, and labels if(data.hasOwnProperty("querytypes")) { From dc61eb82d4b33df02ba68432e00a334453a80331 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 19 Feb 2017 19:10:49 +0100 Subject: [PATCH 026/132] Show summary if no arguments are passed to API --- api_FTL.php | 2 +- scripts/pi-hole/php/data.php | 3 +-- scripts/pi-hole/php/func.php | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index 6711d545..2fec16a0 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -21,7 +21,7 @@ header('Content-type: application/json'); $data = []; -if (isset($_GET['summary']) || isset($_GET['summaryRaw'])) +if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) { sendRequestFTL("stats"); $return = getResponseFTL(); 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. */ - - - Date: Sun, 19 Feb 2017 19:25:04 +0100 Subject: [PATCH 027/132] Make FTL healtcheck box collapsed on settings page --- settings.php | 61 +++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/settings.php b/settings.php index 99f96aaf..c911ba34 100644 --- a/settings.php +++ b/settings.php @@ -736,35 +736,6 @@
    • */ ?> - -
    -
    -

    FTL status (Running, PID: Not running)

    -
    -
    - Time FTL started:
    - User / Group: /
    - Total CPU utilization: %
    - Total CPU time:
    - Memory utilization: %
    - Used memory:
    - -
    -

    System Administration

    @@ -785,6 +756,38 @@ if($FTL)
    + +
    +
    +

    Pi-hole FTL (RunningNot running)

    +
    +
    +
    + Process identifier (PID):
    + Time FTL started:
    + User / Group: / +
    (WARNING: You should not use root as user for running FTL!)
    + Total CPU utilization: %
    + Total CPU time:
    + Memory utilization: %
    + Used memory:
    + +
    +

    Pi-hole Teleporter

    From c3047f76c9f01dd9ee9613bb537ce619d62818ae Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 20 Feb 2017 11:33:24 +0100 Subject: [PATCH 028/132] Add api.php?version --- api_FTL.php | 12 +++++++++++- api_PHP.php | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/api_FTL.php b/api_FTL.php index 2fec16a0..f4d53bc9 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -21,6 +21,12 @@ header('Content-type: application/json'); $data = []; +if (isset($_GET['version'])) { + $version = array(); + $version["version"] = "FTL"; + $data = array_merge($data, $version); +} + if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) { sendRequestFTL("stats"); @@ -230,7 +236,11 @@ if(isset($_GET["recentBlocked"])) unset($data); } -if(isset($data)) +if(isset($_GET["jsonForceObject"])) +{ + echo json_encode($data, JSON_FORCE_OBJECT); +} +else { echo json_encode($data); } diff --git a/api_PHP.php b/api_PHP.php index f8f65876..a71e9401 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -24,6 +24,12 @@ // Non-Auth + if (isset($_GET['version'])) { + $version = array(); + $version["version"] = "PHP"; + $data = array_merge($data, $version); + } + if (isset($_GET['summaryRaw'])) { $data = array_merge($data, getSummaryData()); } From 3060279c68c5d4efe665e95dc2c5df06d621a124 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 20 Feb 2017 11:39:11 +0100 Subject: [PATCH 029/132] Extend README text --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6e7e1668..7675162a 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,8 @@ A read-only API can be accessed at `/admin/api.php`. With either no parameters o There are many more parameters, such as `summaryRaw`, `overTimeData10mins`, `topItems`, ` topClients` or `getQuerySources`, `getQueryTypes`, `getForwardDestinations`, and finally `getAllQueries`. Together with a token it is also possible to enable and disable (also with a set timeout) blocking via the API +The API returns more information (in a slighly different format if `FTL` is running) - it supports a fall-back to the "old" PHP API if `FTL` is not running. Test the version by using the parameter `version`. +

    We use BrowserStack for multi-platform multi-browser testing. From e3d791abb65c1a4634a8b6eccc6af20753d4e0fa Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 20 Feb 2017 12:45:56 +0100 Subject: [PATCH 030/132] Add type / version --- api_FTL.php | 8 +++++--- api_PHP.php | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index f4d53bc9..90a8af20 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -21,10 +21,12 @@ header('Content-type: application/json'); $data = []; +if (isset($_GET['type'])) { + $data["type"] = "FTL"; +} + if (isset($_GET['version'])) { - $version = array(); - $version["version"] = "FTL"; - $data = array_merge($data, $version); + $data["version"] = 2; } if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) diff --git a/api_PHP.php b/api_PHP.php index a71e9401..4f75a0f8 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -24,10 +24,12 @@ // Non-Auth + if (isset($_GET['type'])) { + $data["type"] = "PHP"; + } + if (isset($_GET['version'])) { - $version = array(); - $version["version"] = "PHP"; - $data = array_merge($data, $version); + $data["version"] = 1; } if (isset($_GET['summaryRaw'])) { From d82f2ef474787545296a3fd9708775889caf0e7b Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 20 Feb 2017 12:46:38 +0100 Subject: [PATCH 031/132] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7675162a..e3f3b257 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A read-only API can be accessed at `/admin/api.php`. With either no parameters o There are many more parameters, such as `summaryRaw`, `overTimeData10mins`, `topItems`, ` topClients` or `getQuerySources`, `getQueryTypes`, `getForwardDestinations`, and finally `getAllQueries`. Together with a token it is also possible to enable and disable (also with a set timeout) blocking via the API -The API returns more information (in a slighly different format if `FTL` is running) - it supports a fall-back to the "old" PHP API if `FTL` is not running. Test the version by using the parameter `version`. +The API returns more information (in a slighly different format if `FTL` is running) - it supports a fall-back to the "old" PHP API if `FTL` is not running. Test the type and/or version of the API by using the parameter `type` and `version`.

    From edd52d0de45253993007712ff3854bb32a683333 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 22 Feb 2017 11:09:08 +0100 Subject: [PATCH 032/132] Show FTL version on Settings page --- settings.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.php b/settings.php index c911ba34..75ff671b 100644 --- a/settings.php +++ b/settings.php @@ -760,6 +760,7 @@ if($FTL) { $parts = preg_split('/\s+/',trim(exec("ps -p `cat /var/run/pihole-FTL.pid` -o pid,start,vsz,rss,euser,egroup,cputime,%cpu,%mem"))); + $FTLversion = exec("/usr/bin/pihole-FTL version"); // pid // time the command started. If the process was started less than 24 hours ago, the output format is "HH:MM:SS", else it is " Mmm dd" (where Mmm is a three-letter month name). // virtual memory size of the process in KiB @@ -777,7 +778,8 @@ if($FTL)
    - Process identifier (PID):
    + FTL version:
    + Process identifier (PID):
    Time FTL started:
    User / Group: /
    (WARNING: You should not use root as user for running FTL!)
    From d58439e0d9b50390bba7d44d9faf159ea2fa45c9 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 22 Feb 2017 11:41:25 +0100 Subject: [PATCH 033/132] Some cosmetics for fresh installed systems --- queries.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/queries.php b/queries.php index 7dd4d1ae..e26df9fe 100644 --- a/queries.php +++ b/queries.php @@ -19,21 +19,27 @@ if(isset($setupVars["API_QUERY_LOG_SHOW"])) { if($setupVars["API_QUERY_LOG_SHOW"] === "all") { - $showing = "(showing all queries"; + $showing = "showing all queries"; } elseif($setupVars["API_QUERY_LOG_SHOW"] === "permittedonly") { - $showing = "(showing permitted queries only"; + $showing = "showing permitted queries only"; } elseif($setupVars["API_QUERY_LOG_SHOW"] === "blockedonly") { - $showing = "(showing blocked queries only"; + $showing = "showing blocked queries only"; } elseif($setupVars["API_QUERY_LOG_SHOW"] === "nothing") { - $showing = "(showing no queries at all"; + $showing = "showing no queries at all"; } } +else +{ + // If filter variable is not set, we + // automatically show all queries + $showing = "showing all queries"; +} if(isset($_GET["all"])) { @@ -64,7 +70,11 @@ if(isset($setupVars["API_PRIVACY_MODE"])) $showing .= ", privacy mode enabled"; } } -$showing .= ")"; + +if(strlen($showing) > 0) +{ + $showing = "(".$showing.")"; +} ?> From bb9c669109d622f660edbeaadd72615ba1a05d74 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 23 Feb 2017 13:17:45 +0100 Subject: [PATCH 034/132] Adapt API versions --- api_FTL.php | 2 +- api_PHP.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index 90a8af20..3ec9b8cc 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -26,7 +26,7 @@ if (isset($_GET['type'])) { } if (isset($_GET['version'])) { - $data["version"] = 2; + $data["version"] = 3; } if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) diff --git a/api_PHP.php b/api_PHP.php index 4f75a0f8..2d9598b2 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -29,7 +29,7 @@ } if (isset($_GET['version'])) { - $data["version"] = 1; + $data["version"] = 2; } if (isset($_GET['summaryRaw'])) { From a6a4c944b0255a1361c1aec000201152912f8a7f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 23 Feb 2017 14:20:26 +0100 Subject: [PATCH 035/132] Several optimizations to the new FTL API --- api.php | 2 +- api_FTL.php | 46 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/api.php b/api.php index 6683a2e7..e2fe9d25 100644 --- a/api.php +++ b/api.php @@ -9,7 +9,7 @@ $api = true; require("scripts/pi-hole/php/FTL.php"); -if(testFTL()) +if(testFTL() && !isset($_GET["PHP"])) { require("api_FTL.php"); } diff --git a/api_FTL.php b/api_FTL.php index 3ec9b8cc..05baba7d 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -52,7 +52,7 @@ if (isset($_GET['summary']) || isset($_GET['summaryRaw']) || !count($_GET)) } else { - $stats[$tmp[0]] = $tmp[1]; + $stats[$tmp[0]] = intval($tmp[1]); } } $data = array_merge($data,$stats); @@ -68,8 +68,8 @@ if (isset($_GET['overTimeData10mins'])) foreach($return as $line) { $tmp = explode(" ",$line); - $domains_over_time[$tmp[0]] = $tmp[1]; - $ads_over_time[$tmp[0]] = $tmp[2]; + $domains_over_time[$tmp[0]] = intval($tmp[1]); + $ads_over_time[$tmp[0]] = intval($tmp[2]); } $result = array('domains_over_time' => $domains_over_time, 'ads_over_time' => $ads_over_time); @@ -80,7 +80,7 @@ if (isset($_GET['topItems']) && $auth) { if(is_numeric($_GET['topItems'])) { - sendRequestFTL("top-domains ".$_GET['topItems']); + sendRequestFTL("top-domains (".$_GET['topItems'].")"); } else { @@ -92,12 +92,12 @@ if (isset($_GET['topItems']) && $auth) foreach($return as $line) { $tmp = explode(" ",$line); - $top_queries[$tmp[2]] = $tmp[1]; + $top_queries[$tmp[2]] = intval($tmp[1]); } if(is_numeric($_GET['topItems'])) { - sendRequestFTL("top-ads ".$_GET['topItems']); + sendRequestFTL("top-ads (".$_GET['topItems'].")"); } else { @@ -109,7 +109,7 @@ if (isset($_GET['topItems']) && $auth) foreach($return as $line) { $tmp = explode(" ",$line); - $top_ads[$tmp[2]] = $tmp[1]; + $top_ads[$tmp[2]] = intval($tmp[1]); } $result = array('top_queries' => $top_queries, @@ -120,7 +120,25 @@ if (isset($_GET['topItems']) && $auth) if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) { - sendRequestFTL("top-clients"); + + if(isset($_GET['topClients'])) + { + $number = $_GET['topClients']; + } + elseif(isset($_GET['getQuerySources'])) + { + $number = $_GET['getQuerySources']; + } + + if(is_numeric($number)) + { + sendRequestFTL("top-clients (".$number.")"); + } + else + { + sendRequestFTL("top-clients"); + } + $return = getResponseFTL(); $top_clients = array(); foreach($return as $line) @@ -128,11 +146,11 @@ if ((isset($_GET['topClients']) || isset($_GET['getQuerySources'])) && $auth) $tmp = explode(" ",$line); if(count($tmp) == 4) { - $top_clients[$tmp[3]."|".$tmp[2]] = $tmp[1]; + $top_clients[$tmp[3]."|".$tmp[2]] = intval($tmp[1]); } else { - $top_clients[$tmp[2]] = $tmp[1]; + $top_clients[$tmp[2]] = intval($tmp[1]); } } @@ -150,11 +168,11 @@ if (isset($_GET['getForwardDestinations']) && $auth) $tmp = explode(" ",$line); if(count($tmp) == 4) { - $forward_dest[$tmp[3]."|".$tmp[2]] = $tmp[1]; + $forward_dest[$tmp[3]."|".$tmp[2]] = intval($tmp[1]); } else { - $forward_dest[$tmp[2]] = $tmp[1]; + $forward_dest[$tmp[2]] = intval($tmp[1]); } } @@ -170,7 +188,7 @@ if (isset($_GET['getQueryTypes']) && $auth) foreach($return as $ret) { $tmp = explode(": ",$ret); - $querytypes[$tmp[0]] = $tmp[1]; + $querytypes[$tmp[0]] = intval($tmp[1]); } $result = array('querytypes' => $querytypes); @@ -234,7 +252,7 @@ elseif (isset($_GET['disable'], $_GET['token']) && $auth) { if(isset($_GET["recentBlocked"])) { sendRequestFTL("recentBlocked"); - echo getResponseFTL()[0]; + die(getResponseFTL()[0]); unset($data); } From 874ec8c9db9b13fb9b0c2dd879dc634df40792ce Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 23 Feb 2017 15:03:53 +0100 Subject: [PATCH 036/132] Implemented tailLog into FTL API --- api_FTL.php | 25 +++++++++++++++++++++++++ scripts/pi-hole/js/taillog.js | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index 05baba7d..2597564b 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -249,6 +249,31 @@ elseif (isset($_GET['disable'], $_GET['token']) && $auth) { $data = array_merge($data, array("status" => "disabled")); } +if (isset($_GET['tailLog']) && $auth) { + // Not using SplFileObject here, since direct + // usage of f-streams will be much faster for + // files as large as the pihole.log + $file = fopen("/var/log/pihole.log","r"); + $offset = intval($_GET['tailLog']); + if($offset > 0) + { + // Seeks on the file pointer where we want to continue reading is known + fseek($file, $offset); + $lines = []; + while (!feof($file)) + array_push($lines,fgets($file)); + $data = array_merge($data, array("offset" => ftell($file), "lines" => $lines)); + } + else + { + // Locate the current position of the file read/write pointer + fseek($file, -1, SEEK_END); + // Add one to skip the very last "\n" in the log file + $data = array_merge($data, array("offset" => ftell($file)+1)); + } + fclose($file); +} + if(isset($_GET["recentBlocked"])) { sendRequestFTL("recentBlocked"); diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js index 32272de9..ffe370fc 100644 --- a/scripts/pi-hole/js/taillog.js +++ b/scripts/pi-hole/js/taillog.js @@ -12,7 +12,7 @@ var interval = 200; // Function that asks the API for new data function reloadData(){ clearTimeout(timer); - $.getJSON("api_PHP.php?tailLog="+offset, function (data) + $.getJSON("api.php?tailLog="+offset, function (data) { offset = data["offset"]; pre.append(data["lines"]); @@ -27,7 +27,7 @@ function reloadData(){ $(function(){ // Get offset at first loading of page - $.getJSON("api_PHP.php?tailLog", function (data) + $.getJSON("api.php?tailLog", function (data) { offset = data["offset"]; }); From 9471594bdfa2c49756e9d07515adcec2ebf399c7 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 23 Feb 2017 15:12:23 +0100 Subject: [PATCH 037/132] Move tailLog function into own file --- api_FTL.php | 25 ----------------------- api_PHP.php | 4 ---- scripts/pi-hole/js/taillog.js | 4 ++-- scripts/pi-hole/php/tailLog.php | 35 +++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 scripts/pi-hole/php/tailLog.php diff --git a/api_FTL.php b/api_FTL.php index 2597564b..05baba7d 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -249,31 +249,6 @@ elseif (isset($_GET['disable'], $_GET['token']) && $auth) { $data = array_merge($data, array("status" => "disabled")); } -if (isset($_GET['tailLog']) && $auth) { - // Not using SplFileObject here, since direct - // usage of f-streams will be much faster for - // files as large as the pihole.log - $file = fopen("/var/log/pihole.log","r"); - $offset = intval($_GET['tailLog']); - if($offset > 0) - { - // Seeks on the file pointer where we want to continue reading is known - fseek($file, $offset); - $lines = []; - while (!feof($file)) - array_push($lines,fgets($file)); - $data = array_merge($data, array("offset" => ftell($file), "lines" => $lines)); - } - else - { - // Locate the current position of the file read/write pointer - fseek($file, -1, SEEK_END); - // Add one to skip the very last "\n" in the log file - $data = array_merge($data, array("offset" => ftell($file)+1)); - } - fclose($file); -} - if(isset($_GET["recentBlocked"])) { sendRequestFTL("recentBlocked"); diff --git a/api_PHP.php b/api_PHP.php index 2d9598b2..f76d60ca 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -109,10 +109,6 @@ $data = array_merge($data, getGravity()); } - if (isset($_GET['tailLog']) && $auth) { - $data = array_merge($data, tailPiholeLog($_GET['tailLog'])); - } - function filterArray(&$inArray) { $outArray = array(); foreach ($inArray as $key=>$value) { diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js index ffe370fc..7e3b2dc3 100644 --- a/scripts/pi-hole/js/taillog.js +++ b/scripts/pi-hole/js/taillog.js @@ -12,7 +12,7 @@ var interval = 200; // Function that asks the API for new data function reloadData(){ clearTimeout(timer); - $.getJSON("api.php?tailLog="+offset, function (data) + $.getJSON("scripts/pi-hole/php/tailLog.php?offset="+offset, function (data) { offset = data["offset"]; pre.append(data["lines"]); @@ -27,7 +27,7 @@ function reloadData(){ $(function(){ // Get offset at first loading of page - $.getJSON("api.php?tailLog", function (data) + $.getJSON("scripts/pi-hole/php/tailLog.php", function (data) { offset = data["offset"]; }); diff --git a/scripts/pi-hole/php/tailLog.php b/scripts/pi-hole/php/tailLog.php new file mode 100644 index 00000000..0ccc0eef --- /dev/null +++ b/scripts/pi-hole/php/tailLog.php @@ -0,0 +1,35 @@ + 0) + { + // Seeks on the file pointer where we want to continue reading is known + fseek($file, $offset); + $lines = []; + while (!feof($file)) + array_push($lines,fgets($file)); + die(json_encode(array("offset" => ftell($file), "lines" => $lines))); + } +} + +// Locate the current position of the file read/write pointer +fseek($file, -1, SEEK_END); +// Add one to skip the very last "\n" in the log file +die(json_encode(array("offset" => ftell($file)+1))); + +?> From 9fec6bb7fb1189fb501dfc591aa4ce46a42dc537 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 27 Feb 2017 15:42:50 +0100 Subject: [PATCH 038/132] Necessary changes doe to commit 85a7818e7996b44b15d51af26ecf165e672d616b --- scripts/pi-hole/js/index.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index e9226731..d942558f 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -71,11 +71,21 @@ function updateQueriesOverTime() { timeLineChart.data.labels = []; timeLineChart.data.datasets[0].data = []; timeLineChart.data.datasets[1].data = []; - // Add data for each hour that is available + + // Add data for each hour that is available for (var hour in data.ads_over_time[0]) { if ({}.hasOwnProperty.call(data.ads_over_time[0], hour)) { - var h = parseInt(data.domains_over_time[0][hour]); - var d = new Date().setHours(Math.floor(h / 6), 10 * (h % 6), 0, 0); + if(parseInt(data.ads_over_time[0][0]) < 1200) + { + // Fallback - old style + var h = parseInt(data.domains_over_time[0][hour]); + var d = new Date().setHours(Math.floor(h / 6), 10 * (h % 6), 0, 0); + } + else + { + // New style: Get Unix timestamps + var d = new Date(1000*parseInt(data.domains_over_time[0][hour])); + } timeLineChart.data.labels.push(d); timeLineChart.data.datasets[0].data.push(data.domains_over_time[1][hour]); From aacc2153946f98a9f50c1459d2de8f3b19c78865 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 27 Feb 2017 17:20:12 +0100 Subject: [PATCH 039/132] Some simplifications + center 10min interval data in the middle instead of the beginning of the corresponding interval --- api_FTL.php | 4 ++-- scripts/pi-hole/js/index.js | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index 05baba7d..524d2d2d 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -68,8 +68,8 @@ if (isset($_GET['overTimeData10mins'])) foreach($return as $line) { $tmp = explode(" ",$line); - $domains_over_time[$tmp[0]] = intval($tmp[1]); - $ads_over_time[$tmp[0]] = intval($tmp[2]); + $domains_over_time[intval($tmp[0])] = intval($tmp[1]); + $ads_over_time[intval($tmp[0])] = intval($tmp[2]); } $result = array('domains_over_time' => $domains_over_time, 'ads_over_time' => $ads_over_time); diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index d942558f..bc963aa3 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -75,16 +75,17 @@ function updateQueriesOverTime() { // Add data for each hour that is available for (var hour in data.ads_over_time[0]) { if ({}.hasOwnProperty.call(data.ads_over_time[0], hour)) { + var d,h; + h = parseInt(data.domains_over_time[0][hour]); if(parseInt(data.ads_over_time[0][0]) < 1200) { // Fallback - old style - var h = parseInt(data.domains_over_time[0][hour]); - var d = new Date().setHours(Math.floor(h / 6), 10 * (h % 6), 0, 0); + d = new Date().setHours(Math.floor(h / 6), 10 * (h % 6), 0, 0); } else { // New style: Get Unix timestamps - var d = new Date(1000*parseInt(data.domains_over_time[0][hour])); + d = new Date(1000*h); } timeLineChart.data.labels.push(d); @@ -350,8 +351,8 @@ $(document).ready(function() { var time = label.match(/(\d?\d):?(\d?\d?)/); var h = parseInt(time[1], 10); var m = parseInt(time[2], 10) || 0; - var from = padNumber(h)+":"+padNumber(m)+":00"; - var to = padNumber(h)+":"+padNumber(m+9)+":59"; + var from = padNumber(h)+":"+padNumber(m-5)+":00"; + var to = padNumber(h)+":"+padNumber(m+4)+":59"; return "Queries from "+from+" to "+to; }, label: function(tooltipItems, data) { @@ -473,8 +474,8 @@ $(document).ready(function() { var label = timeLineChart.data.labels[clickedElementindex]; //get value by index - var from = label/1000; - var until = label/1000 + 600; + var from = label/1000 - 300; + var until = label/1000 + 300; window.location.href = "queries.php?from="+from+"&until="+until; } return false; From 43b60829dc9d42fd77f49de9e7eaee32ab12ad99 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 28 Feb 2017 14:49:43 +0100 Subject: [PATCH 040/132] Copy disable coutdown timer and new (simplified) API token authentification from PHP API to FTL API --- api_FTL.php | 60 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/api_FTL.php b/api_FTL.php index 524d2d2d..e48983a2 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -229,25 +229,47 @@ if (isset($_GET['getAllQueries']) && $auth) $data = array_merge($data, $result); } -if (isset($_GET['enable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - exec('sudo pihole enable'); - $data = array_merge($data, array("status" => "enabled")); -} -elseif (isset($_GET['disable'], $_GET['token']) && $auth) { - check_csrf($_GET['token']); - $disable = intval($_GET['disable']); - // intval returns the integer value on success, or 0 on failure - if($disable > 0) - { - exec("sudo pihole disable ".$disable."s"); - } - else - { - exec('sudo pihole disable'); - } - $data = array_merge($data, array("status" => "disabled")); -} + if (isset($_GET['enable']) && $auth) { + if(isset($_GET["auth"])) + { + if($_GET["auth"] !== $pwhash) + die("Not authorized!"); + } + else + { + // Skip token validation if explicit auth string is given + check_csrf($_GET['token']); + } + exec('sudo pihole enable'); + $data = array_merge($data, array("status" => "enabled")); + unlink("../custom_disable_timer"); + } + elseif (isset($_GET['disable']) && $auth) { + if(isset($_GET["auth"])) + { + if($_GET["auth"] !== $pwhash) + die("Not authorized!"); + } + else + { + // Skip token validation if explicit auth string is given + check_csrf($_GET['token']); + } + $disable = intval($_GET['disable']); + // intval returns the integer value on success, or 0 on failure + if($disable > 0) + { + $timestamp = time(); + exec("sudo pihole disable ".$disable."s"); + file_put_contents("../custom_disable_timer",($timestamp+$disable)*1000); + } + else + { + exec('sudo pihole disable'); + unlink("../custom_disable_timer"); + } + $data = array_merge($data, array("status" => "disabled")); + } if(isset($_GET["recentBlocked"])) { From fb8f0a081e19cbfba03b5b4f6b23f202ef29d2cd Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 1 Mar 2017 14:05:38 +0100 Subject: [PATCH 041/132] Move API functions that are neither FTL nor PHP specific (enable, disable) to api.php --- api.php | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ api_FTL.php | 58 ------------------------------------------------- api_PHP.php | 59 -------------------------------------------------- 3 files changed, 62 insertions(+), 117 deletions(-) diff --git a/api.php b/api.php index eaed3c03..d75b55ff 100644 --- a/api.php +++ b/api.php @@ -7,8 +7,61 @@ * Please see LICENSE file for your rights under this license */ $api = true; +header('Content-type: application/json'); require("scripts/pi-hole/php/FTL.php"); +require("scripts/pi-hole/php/password.php"); +require("scripts/pi-hole/php/auth.php"); +check_cors(); + +$data = array(); + +// Common API functions +if (isset($_GET['enable']) && $auth) +{ + if(isset($_GET["auth"])) + { + if($_GET["auth"] !== $pwhash) + die("Not authorized!"); + } + else + { + // Skip token validation if explicit auth string is given + check_csrf($_GET['token']); + } + exec('sudo pihole enable'); + $data = array_merge($data, array("status" => "enabled")); + unlink("../custom_disable_timer"); +} +elseif (isset($_GET['disable']) && $auth) +{ + if(isset($_GET["auth"])) + { + if($_GET["auth"] !== $pwhash) + die("Not authorized!"); + } + else + { + // Skip token validation if explicit auth string is given + check_csrf($_GET['token']); + } + $disable = intval($_GET['disable']); + // intval returns the integer value on success, or 0 on failure + if($disable > 0) + { + $timestamp = time(); + exec("sudo pihole disable ".$disable."s"); + file_put_contents("../custom_disable_timer",($timestamp+$disable)*1000); + } + else + { + exec('sudo pihole disable'); + unlink("../custom_disable_timer"); + } + $data = array_merge($data, array("status" => "disabled")); +} + +// Other API functions if(testFTL() && !isset($_GET["PHP"])) { require("api_FTL.php"); @@ -17,4 +70,13 @@ else { require("api_PHP.php"); } + +if(isset($_GET["jsonForceObject"])) +{ + echo json_encode($data, JSON_FORCE_OBJECT); +} +else +{ + echo json_encode($data); +} ?> diff --git a/api_FTL.php b/api_FTL.php index e48983a2..23419a45 100644 --- a/api_FTL.php +++ b/api_FTL.php @@ -12,14 +12,7 @@ if(!isset($api)) die("Direct call to api_FTL.php is not allowed!"); } -require "scripts/pi-hole/php/password.php"; -require "scripts/pi-hole/php/auth.php"; - -check_cors(); $socket = connectFTL("127.0.0.1"); -header('Content-type: application/json'); - -$data = []; if (isset($_GET['type'])) { $data["type"] = "FTL"; @@ -229,48 +222,6 @@ if (isset($_GET['getAllQueries']) && $auth) $data = array_merge($data, $result); } - if (isset($_GET['enable']) && $auth) { - if(isset($_GET["auth"])) - { - if($_GET["auth"] !== $pwhash) - die("Not authorized!"); - } - else - { - // Skip token validation if explicit auth string is given - check_csrf($_GET['token']); - } - exec('sudo pihole enable'); - $data = array_merge($data, array("status" => "enabled")); - unlink("../custom_disable_timer"); - } - elseif (isset($_GET['disable']) && $auth) { - if(isset($_GET["auth"])) - { - if($_GET["auth"] !== $pwhash) - die("Not authorized!"); - } - else - { - // Skip token validation if explicit auth string is given - check_csrf($_GET['token']); - } - $disable = intval($_GET['disable']); - // intval returns the integer value on success, or 0 on failure - if($disable > 0) - { - $timestamp = time(); - exec("sudo pihole disable ".$disable."s"); - file_put_contents("../custom_disable_timer",($timestamp+$disable)*1000); - } - else - { - exec('sudo pihole disable'); - unlink("../custom_disable_timer"); - } - $data = array_merge($data, array("status" => "disabled")); - } - if(isset($_GET["recentBlocked"])) { sendRequestFTL("recentBlocked"); @@ -278,14 +229,5 @@ if(isset($_GET["recentBlocked"])) unset($data); } -if(isset($_GET["jsonForceObject"])) -{ - echo json_encode($data, JSON_FORCE_OBJECT); -} -else -{ - echo json_encode($data); -} - disconnectFTL(); ?> diff --git a/api_PHP.php b/api_PHP.php index c41024e6..dc7a1d2b 100644 --- a/api_PHP.php +++ b/api_PHP.php @@ -12,15 +12,7 @@ die("Direct call to api_PHP.php is not allowed!"); } - require "scripts/pi-hole/php/password.php"; - require "scripts/pi-hole/php/auth.php"; - - check_cors(); - include('scripts/pi-hole/php/data.php'); - header('Content-type: application/json'); - - $data = array(); // Non-Auth @@ -81,48 +73,6 @@ $data = array_merge($data, getAllQueries($_GET['getAllQueries'])); } - if (isset($_GET['enable']) && $auth) { - if(isset($_GET["auth"])) - { - if($_GET["auth"] !== $pwhash) - die("Not authorized!"); - } - else - { - // Skip token validation if explicit auth string is given - check_csrf($_GET['token']); - } - exec('sudo pihole enable'); - $data = array_merge($data, array("status" => "enabled")); - unlink("../custom_disable_timer"); - } - elseif (isset($_GET['disable']) && $auth) { - if(isset($_GET["auth"])) - { - if($_GET["auth"] !== $pwhash) - die("Not authorized!"); - } - else - { - // Skip token validation if explicit auth string is given - check_csrf($_GET['token']); - } - $disable = intval($_GET['disable']); - // intval returns the integer value on success, or 0 on failure - if($disable > 0) - { - $timestamp = time(); - exec("sudo pihole disable ".$disable."s"); - file_put_contents("../custom_disable_timer",($timestamp+$disable)*1000); - } - else - { - exec('sudo pihole disable'); - unlink("../custom_disable_timer"); - } - $data = array_merge($data, array("status" => "disabled")); - } - if (isset($_GET['getGravityDomains'])) { $data = array_merge($data, getGravity()); } @@ -140,13 +90,4 @@ } $data = filterArray($data); - - if(isset($_GET["jsonForceObject"])) - { - echo json_encode($data, JSON_FORCE_OBJECT); - } - else - { - echo json_encode($data); - } ?> From 40fd8b8b1d461f853b7f093f4744a8c6aacec229 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 2 Mar 2017 14:11:09 +0100 Subject: [PATCH 042/132] Add IPv6 upstream servers --- scripts/pi-hole/php/savesettings.php | 50 +++++++++++++++++++--------- settings.php | 26 ++++++++++----- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index 84c78de1..4da81f27 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -86,19 +86,36 @@ function readStaticLeasesFile() return true; } +function isequal(&$argument, &$compareto) { + $ret = false; + if(isset($argument)) + { + if($argument === $compareto) + { + return true; + } + } + return false; +} + +function isinserverlist($ip) { + global $DNSserverslist; + foreach ($DNSserverslist as $key => $value) { + if (isequal($value['v4p'],$ip) || isequal($value['v4s'],$ip)) + return true; + if (isequal($value['v6p'],$ip) || isequal($value['v6s'],$ip)) + return true; + } + return false; +} + $DNSserverslist = [ - "8.8.8.8" => "Google (Primary)", - "208.67.222.222" => "OpenDNS (Primary)", - "4.2.2.1" => "Level3 (Primary)", - "199.85.126.10" => "Norton (Primary)", - "8.26.56.26" => "Comodo (Primary)", - "84.200.69.80" => "DNS.WATCH (Primary)", - "8.8.4.4" => "Google (Secondary)", - "208.67.220.220" => "OpenDNS (Secondary)", - "4.2.2.2" => "Level3 (Secondary)", - "199.85.127.10" => "Norton (Secondary)", - "8.20.247.20" => "Comodo (Secondary)", - "84.200.70.40" => "DNS.WATCH (Secondary)", + "Google" => ["v4p" => "8.8.8.8","v4s" => "8.8.4.4", "v6p" => "2001:4860:4860:0:0:0:0:8888", "v6s" => "2001:4860:4860:0:0:0:0:8844"], + "OpenDNS" => ["v4p" => "208.67.222.222", "v4s" => "208.67.220.220"], + "Level3" => ["v4p" => "4.2.2.1", "v4s" => "4.2.2.2"], + "Norton" => ["v4p" => "199.85.126.10", "v4s" => "199.85.127.10"], + "Comodo" => ["v4p" => "8.26.56.26", "v4s" => "8.20.247.20"], + "DNS.WATCH" => ["v4p" => "84.200.69.80", "v4s" => "84.200.70.40", "v6p" => "2001:1608:10:25:0:0:1c04:b12f", "v6s" => "2001:1608:10:25:0:0:9249:d69b"] ]; $error = ""; @@ -115,9 +132,12 @@ function readStaticLeasesFile() // Add selected predefined servers to list foreach ($DNSserverslist as $key => $value) { - if(array_key_exists("DNSserver".str_replace(".","_",$key),$_POST)) + foreach(["v4p", "v4s", "v6p", "v6s"] as $type) { - array_push($DNSservers,$key); + if(@array_key_exists("DNSserver".str_replace(".","_",$value[$type]),$_POST)) + { + array_push($DNSservers,$value[$type]); + } } } @@ -195,7 +215,7 @@ function readStaticLeasesFile() // Fallback $DNSinterface = "local"; } - $return .= exec("sudo pihole -a -i ".$DNSinterface." -web"); + exec("sudo pihole -a -i ".$DNSinterface." -web"); // If there has been no error we can save the new DNS server IPs if(!strlen($error)) diff --git a/settings.php b/settings.php index 469be26e..f86b7d4b 100644 --- a/settings.php +++ b/settings.php @@ -393,20 +393,20 @@
    -
    + $value) { ?> +
    - -
    - + + + + + + + + + + + +
    IPv4 1  IPv4 2  IPv6 1  IPv6 2  Name
    ">" value="true" checked >">" value="true" checked >">" value="true" checked >">" value="true" checked >
    From d9cbbde0501a7304c7348bdc1c4bf5164974a64c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 3 Mar 2017 14:17:28 +0100 Subject: [PATCH 043/132] Read *all* DNS records in setupVars.conf (remove limitation to 12 servers) --- settings.php | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/settings.php b/settings.php index f86b7d4b..ca70b23c 100644 --- a/settings.php +++ b/settings.php @@ -398,36 +398,35 @@ $DNSservers = []; $DNSactive = []; - for($i=1;$i<=12;$i++) - { - if(isset($setupVars["PIHOLE_DNS_".$i])){ - if(isinserverlist($setupVars["PIHOLE_DNS_".$i])) + $i = 1; + while(isset($setupVars["PIHOLE_DNS_".$i])){ + if(isinserverlist($setupVars["PIHOLE_DNS_".$i])) + { + array_push($DNSactive,$setupVars["PIHOLE_DNS_".$i]); + } + elseif(strpos($setupVars["PIHOLE_DNS_".$i],".")) + { + if(!isset($custom1)) { - array_push($DNSactive,$setupVars["PIHOLE_DNS_".$i]); + $custom1 = $setupVars["PIHOLE_DNS_".$i]; } - elseif(strpos($setupVars["PIHOLE_DNS_".$i],".")) + else { - if(!isset($custom1)) - { - $custom1 = $setupVars["PIHOLE_DNS_".$i]; - } - else - { - $custom2 = $setupVars["PIHOLE_DNS_".$i]; - } - } - elseif(strpos($setupVars["PIHOLE_DNS_".$i],":")) - { - if(!isset($custom3)) - { - $custom3 = $setupVars["PIHOLE_DNS_".$i]; - } - else - { - $custom4 = $setupVars["PIHOLE_DNS_".$i]; - } + $custom2 = $setupVars["PIHOLE_DNS_".$i]; } } + elseif(strpos($setupVars["PIHOLE_DNS_".$i],":")) + { + if(!isset($custom3)) + { + $custom3 = $setupVars["PIHOLE_DNS_".$i]; + } + else + { + $custom4 = $setupVars["PIHOLE_DNS_".$i]; + } + } + $i++; } if(isset($setupVars["DNS_FQDN_REQUIRED"])){ From 4182a83bd43479a782e250ffbf3bf3e557b99d96 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 3 Mar 2017 14:39:51 +0100 Subject: [PATCH 044/132] Codacy and styling --- scripts/pi-hole/php/savesettings.php | 26 ++++++++++++-------------- settings.php | 26 +++++++++++++++----------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index 4da81f27..15bb5fef 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -24,15 +24,14 @@ function validIP($address){ // Check for existance of variable // and test it only if it exists function istrue(&$argument) { - $ret = false; if(isset($argument)) { if($argument) { - $ret = true; + return true; } } - return $ret; + return false; } // Credit: http://stackoverflow.com/a/4694816/2087442 @@ -87,7 +86,6 @@ function readStaticLeasesFile() } function isequal(&$argument, &$compareto) { - $ret = false; if(isset($argument)) { if($argument === $compareto) @@ -98,24 +96,24 @@ function isequal(&$argument, &$compareto) { return false; } -function isinserverlist($ip) { +function isinserverlist($addr) { global $DNSserverslist; foreach ($DNSserverslist as $key => $value) { - if (isequal($value['v4p'],$ip) || isequal($value['v4s'],$ip)) + if (isequal($value['v4_1'],$addr) || isequal($value['v4_2'],$addr)) return true; - if (isequal($value['v6p'],$ip) || isequal($value['v6s'],$ip)) + if (isequal($value['v6_1'],$addr) || isequal($value['v6_2'],$addr)) return true; } return false; } $DNSserverslist = [ - "Google" => ["v4p" => "8.8.8.8","v4s" => "8.8.4.4", "v6p" => "2001:4860:4860:0:0:0:0:8888", "v6s" => "2001:4860:4860:0:0:0:0:8844"], - "OpenDNS" => ["v4p" => "208.67.222.222", "v4s" => "208.67.220.220"], - "Level3" => ["v4p" => "4.2.2.1", "v4s" => "4.2.2.2"], - "Norton" => ["v4p" => "199.85.126.10", "v4s" => "199.85.127.10"], - "Comodo" => ["v4p" => "8.26.56.26", "v4s" => "8.20.247.20"], - "DNS.WATCH" => ["v4p" => "84.200.69.80", "v4s" => "84.200.70.40", "v6p" => "2001:1608:10:25:0:0:1c04:b12f", "v6s" => "2001:1608:10:25:0:0:9249:d69b"] + "Google" => ["v4_1" => "8.8.8.8","v4_2" => "8.8.4.4", "v6_1" => "2001:4860:4860:0:0:0:0:8888", "v6_2" => "2001:4860:4860:0:0:0:0:8844"], + "OpenDNS" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220"], + "Level3" => ["v4_1" => "4.2.2.1", "v4_2" => "4.2.2.2"], + "Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"], + "Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"], + "DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"] ]; $error = ""; @@ -132,7 +130,7 @@ function isinserverlist($ip) { // Add selected predefined servers to list foreach ($DNSserverslist as $key => $value) { - foreach(["v4p", "v4s", "v6p", "v6s"] as $type) + foreach(["v4_1", "v4_2", "v6_1", "v6_2"] as $type) { if(@array_key_exists("DNSserver".str_replace(".","_",$value[$type]),$_POST)) { diff --git a/settings.php b/settings.php index ca70b23c..3abced73 100644 --- a/settings.php +++ b/settings.php @@ -493,20 +493,24 @@
    - +
    IPv4 1  IPv4 2  IPv6 1  IPv6 2  Name
    + + + + + $value) { ?> -
    - -
    - - - - - - + + + + + + + + - +
    IPv4IPv6Name
    ">" value="true" checked >">" value="true" checked >">" value="true" checked >">" value="true" checked >">" value="true" checked >">" value="true" checked >">" value="true" checked >">" value="true" checked >
    From 04a9987cb99d1fb144052a43dfbffc27b6469750 Mon Sep 17 00:00:00 2001 From: Barisi Date: Fri, 3 Mar 2017 23:28:58 +0000 Subject: [PATCH 045/132] Added space between temperature reading and unit --- scripts/pi-hole/php/header.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index bc0fdc92..776e2ac2 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -306,15 +306,15 @@ echo "\"> Temp: "; if($temperatureunit === "F") { - echo round($fahrenheit,1) . "°F"; + echo round($fahrenheit,1) . " °F"; } elseif($temperatureunit === "K") { - echo round($kelvin,1) . "K"; + echo round($kelvin,1) . " K"; } else { - echo round($celsius,1) . "°C"; + echo round($celsius,1) . " °C"; } echo ""; } From 5f4578738f75b1d3ed25f1ede1f89f8bcaaa896e Mon Sep 17 00:00:00 2001 From: Barisi Date: Sat, 4 Mar 2017 12:59:14 +0000 Subject: [PATCH 046/132] changed whitespace to non-breaking space --- scripts/pi-hole/php/header.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 776e2ac2..e6f4d3c3 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -306,15 +306,15 @@ echo "\"> Temp: "; if($temperatureunit === "F") { - echo round($fahrenheit,1) . " °F"; + echo round($fahrenheit,1) . " °F"; } elseif($temperatureunit === "K") { - echo round($kelvin,1) . " K"; + echo round($kelvin,1) . " K"; } else { - echo round($celsius,1) . " °C"; + echo round($celsius,1) . " °C"; } echo ""; } From 65c56eec1ca45652a3024767c4cf6a0ea70dff2f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 4 Mar 2017 20:51:53 +0100 Subject: [PATCH 047/132] Remove some files we don't want in devel --- queries.php | 2 - scripts/pi-hole/js/queries.js | 2 - scripts/vendor/datetime-moment.js | 74 ------------------------------- 3 files changed, 78 deletions(-) delete mode 100644 scripts/vendor/datetime-moment.js diff --git a/queries.php b/queries.php index 180e5a70..e26df9fe 100644 --- a/queries.php +++ b/queries.php @@ -148,5 +148,3 @@ if(strlen($showing) > 0) - - diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index 1d39dce7..feb0317f 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -125,8 +125,6 @@ $(document).ready(function() { APIstring += "&until="+(timestamp + 100); } - $.fn.dataTable.moment("YYY-MM-DD z HH:MM:SS"); - tableApi = $("#all-queries").DataTable( { "rowCallback": function( row, data, index ){ if (data[4] === "1") diff --git a/scripts/vendor/datetime-moment.js b/scripts/vendor/datetime-moment.js deleted file mode 100644 index c9cdded6..00000000 --- a/scripts/vendor/datetime-moment.js +++ /dev/null @@ -1,74 +0,0 @@ -/** - * This plug-in for DataTables represents the ultimate option in extensibility - * for sorting date / time strings correctly. It uses - * [Moment.js](http://momentjs.com) to create automatic type detection and - * sorting plug-ins for DataTables based on a given format. This way, DataTables - * will automatically detect your temporal information and sort it correctly. - * - * For usage instructions, please see the DataTables blog - * post that [introduces it](//datatables.net/blog/2014-12-18). - * - * @name Ultimate Date / Time sorting - * @summary Sort date and time in any format using Moment.js - * @author [Allan Jardine](//datatables.net) - * @depends DataTables 1.10+, Moment.js 1.7+ - * - * @example - * $.fn.dataTable.moment( 'HH:mm MMM D, YY' ); - * $.fn.dataTable.moment( 'dddd, MMMM Do, YYYY' ); - * - * $('#example').DataTable(); - */ - -(function (factory) { - if (typeof define === "function" && define.amd) { - define(["jquery", "moment", "datatables.net"], factory); - } else { - factory(jQuery, moment); - } -}(function ($, moment) { - -$.fn.dataTable.moment = function ( format, locale ) { - var types = $.fn.dataTable.ext.type; - - // Add type detection - types.detect.unshift( function ( d ) { - if ( d ) { - // Strip HTML tags and newline characters if possible - if ( d.replace ) { - d = d.replace(/(<.*?>)|(\r?\n|\r)/g, ''); - } - - // Strip out surrounding white space - d = $.trim( d ); - } - - // Null and empty values are acceptable - if ( d === '' || d === null ) { - return 'moment-'+format; - } - - return moment( d, format, locale, true ).isValid() ? - 'moment-'+format : - null; - } ); - - // Add sorting method - use an integer for the sorting - types.order[ 'moment-'+format+'-pre' ] = function ( d ) { - if ( d ) { - // Strip HTML tags and newline characters if possible - if ( d.replace ) { - d = d.replace(/(<.*?>)|(\r?\n|\r)/g, ''); - } - - // Strip out surrounding white space - d = $.trim( d ); - } - - return d === '' || d === null ? - -Infinity : - parseInt( moment( d, format, locale, true ).format( 'x' ), 10 ); - }; -}; - -})); From 44009a5a2fcebc61a0fb266e3149743712ef6100 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 4 Mar 2017 20:55:07 +0100 Subject: [PATCH 048/132] Make branch mergeable cleanly --- scripts/pi-hole/js/queries.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index feb0317f..073ed50a 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -193,3 +193,5 @@ $(document).ready(function() { } } ); } ); + + From 103c2d43e8e30d45cd3d7d8b81c165a984b8fbb9 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 4 Mar 2017 22:58:38 +0100 Subject: [PATCH 049/132] Require 4 approvals instead of five for merging into master --- .pullapprove.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pullapprove.yml b/.pullapprove.yml index 8bd8f0a2..8bd890cb 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -33,6 +33,6 @@ groups: conditions: branches: - master - required: -1 + required: 4 teams: - admin From e695f490c096d503e72b537cd5c87d3855915a95 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 5 Mar 2017 13:38:06 +0100 Subject: [PATCH 050/132] Add datetimestamp to downloaded filename (e.g. "pi-hole-teleporter_2017-03-05_01-37-52.zip") --- scripts/pi-hole/php/teleporter.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php index 02eacbfc..c9a270b3 100644 --- a/scripts/pi-hole/php/teleporter.php +++ b/scripts/pi-hole/php/teleporter.php @@ -127,7 +127,8 @@ if($_POST["action"] == "in") } else { - $archive_file_name = "/var/www/html/pi-hole-teleporter_".microtime(true).".zip"; + $filename = "pi-hole-teleporter_".date("Y-m-d_h-i-s").".zip"; + $archive_file_name = "/var/www/html/".$filename; $zip = new ZipArchive(); touch($archive_file_name); $res = $zip->open($archive_file_name, ZipArchive::CREATE | ZipArchive::OVERWRITE); @@ -146,7 +147,7 @@ else header("Content-type: application/zip"); header('Content-Transfer-Encoding: binary'); - header("Content-Disposition: attachment; filename=pi-hole-teleporter.zip"); + header("Content-Disposition: attachment; filename=".$filename); header("Content-length: " . filesize($archive_file_name)); header("Pragma: no-cache"); header("Expires: 0"); From c034798f61fccdc401da178286add843e866f98c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 5 Mar 2017 13:54:43 +0100 Subject: [PATCH 051/132] Export also all files found in /etc/dnsmasq.d --- scripts/pi-hole/php/teleporter.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php index c9a270b3..23d935a9 100644 --- a/scripts/pi-hole/php/teleporter.php +++ b/scripts/pi-hole/php/teleporter.php @@ -36,6 +36,22 @@ function add_to_zip($path,$name) $zip->addFile($path.$name,$name); } +function add_dir_to_zip($path) +{ + global $zip; + if($dir = opendir($path)) + { + while(false !== ($entry = readdir($dir))) + { + if($entry !== "." && $entry !== "..") + { + $zip->addFile($path.$entry,$entry); + } + } + closedir($dir); + } +} + function check_domains($domains) { foreach($domains as $domain) @@ -141,6 +157,7 @@ else add_to_zip("/etc/pihole/","blacklist.txt"); add_to_zip("/etc/pihole/","adlists.list"); add_to_zip("/etc/pihole/","setupVars.conf"); + add_dir_to_zip("/etc/dnsmasq.d/"); $zip->addFromString("wildcardblocking.txt", getWildcardListContent()); $zip->close(); From 39e76afd628d1775bb09d1d1e9096711945a0a95 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 5 Mar 2017 14:03:37 +0100 Subject: [PATCH 052/132] Allow generation of ZIP file via command line --- scripts/pi-hole/php/teleporter.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php index 23d935a9..43092806 100644 --- a/scripts/pi-hole/php/teleporter.php +++ b/scripts/pi-hole/php/teleporter.php @@ -7,7 +7,9 @@ * Please see LICENSE file for your rights under this license. */ require "password.php"; -if(!$auth) die("Not authorized"); +if (php_sapi_name() !== "cli") { + if(!$auth) die("Not authorized"); +} require('func.php'); function process_zip($name) @@ -83,9 +85,9 @@ function getWildcardListContent() { return ""; } -if($_POST["action"] == "in") +if(isset($_POST["action"])) { - if($_FILES["zip_file"]["name"]) + if($_FILES["zip_file"]["name"] && $_POST["action"] == "in") { $filename = $_FILES["zip_file"]["name"]; $source = $_FILES["zip_file"]["tmp_name"]; @@ -138,7 +140,7 @@ if($_POST["action"] == "in") } else { - die("No file transmitted."); + die("No file transmitted or parameter error."); } } else @@ -168,7 +170,7 @@ else header("Content-length: " . filesize($archive_file_name)); header("Pragma: no-cache"); header("Expires: 0"); - ob_end_clean(); + if(ob_get_length() > 0) ob_end_clean(); readfile($archive_file_name); exit; } From 7d7b46624cb81af39b92400d6a1a1f804e4ac574 Mon Sep 17 00:00:00 2001 From: Barisi Date: Sun, 5 Mar 2017 17:41:21 +0000 Subject: [PATCH 053/132] Added this space between memory usage reading and unit(%) --- scripts/pi-hole/php/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index e6f4d3c3..5f8826ae 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -348,7 +348,7 @@ } if($memory_usage > 0.0) { - echo "\"> Memory usage:  " . sprintf("%.1f",100.0*$memory_usage) . "%"; + echo "\"> Memory usage:  " . sprintf("%.1f",100.0*$memory_usage) . " %"; } else { From 2653e52fc8ad98e3685508746b88e753d45fda53 Mon Sep 17 00:00:00 2001 From: Barisi Date: Sun, 5 Mar 2017 17:41:21 +0000 Subject: [PATCH 054/132] Added thin space between memory usage reading and unit(%) --- scripts/pi-hole/php/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index e6f4d3c3..5f8826ae 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -348,7 +348,7 @@ } if($memory_usage > 0.0) { - echo "\"> Memory usage:  " . sprintf("%.1f",100.0*$memory_usage) . "%"; + echo "\"> Memory usage:  " . sprintf("%.1f",100.0*$memory_usage) . " %"; } else { From 23334b3dbdf04b8d10069f61233e73e6a558a594 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 5 Mar 2017 23:17:34 +0100 Subject: [PATCH 055/132] Add tail pihole-FTL.log --- scripts/pi-hole/js/taillog-FTL.js | 46 +++++++++++++++++++++++++++++++ scripts/pi-hole/php/header.php | 6 ++++ scripts/pi-hole/php/tailLog.php | 10 ++++++- taillog-FTL.php | 24 ++++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 scripts/pi-hole/js/taillog-FTL.js create mode 100644 taillog-FTL.php diff --git a/scripts/pi-hole/js/taillog-FTL.js b/scripts/pi-hole/js/taillog-FTL.js new file mode 100644 index 00000000..cbe709b5 --- /dev/null +++ b/scripts/pi-hole/js/taillog-FTL.js @@ -0,0 +1,46 @@ +/* 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. */ +var offset, timer, pre, scrolling = true; + +// Check every 200msec for fresh data +var interval = 200; + +// Function that asks the API for new data +function reloadData(){ + clearTimeout(timer); + $.getJSON("scripts/pi-hole/php/tailLog.php?FTL&offset="+offset, function (data) + { + offset = data["offset"]; + pre.append(data["lines"]); + }); + + if(scrolling) + { + window.scrollTo(0,document.body.scrollHeight); + } + timer = setTimeout(reloadData, interval); +} + +$(function(){ + // Get offset at first loading of page + $.getJSON("scripts/pi-hole/php/tailLog.php?FTL", function (data) + { + offset = data["offset"]; + }); + pre = $("#output"); + // Trigger function that looks for new data + reloadData(); +}); + +$("#chk1").click(function() { + $("#chk2").prop("checked",this.checked); + scrolling = this.checked; +}); +$("#chk2").click(function() { + $("#chk1").prop("checked",this.checked); + scrolling = this.checked; +}); diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index bc0fdc92..65720bdf 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -467,6 +467,12 @@ Tail pihole.log + + class="active"> + + Tail pihole-FTL.log + + class="active"> diff --git a/scripts/pi-hole/php/tailLog.php b/scripts/pi-hole/php/tailLog.php index 0ccc0eef..bf23941a 100644 --- a/scripts/pi-hole/php/tailLog.php +++ b/scripts/pi-hole/php/tailLog.php @@ -12,7 +12,15 @@ if(!$auth) die("Not authorized"); // Not using SplFileObject here, since direct // usage of f-streams will be much faster for // files as large as the pihole.log -$file = fopen("/var/log/pihole.log","r"); +if(isset($_GET["FTL"])) +{ + $file = fopen("/var/log/pihole-FTL.log","r"); +} +else +{ + $file = fopen("/var/log/pihole.log","r"); +} + if(isset($_GET["offset"])) { $offset = intval($_GET['offset']); diff --git a/taillog-FTL.php b/taillog-FTL.php new file mode 100644 index 00000000..b8c79e61 --- /dev/null +++ b/taillog-FTL.php @@ -0,0 +1,24 @@ + + + +
    +

    Output the last lines of the pihole-FTL.log file (live)

    +
    + +
    +
    
+
    
+
+
+
+
+

From 21283887ff16445fe5cca90a7a27edcbb948dae3 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 6 Mar 2017 11:59:21 +0100
Subject: [PATCH 056/132] Fix fallback for default listening behavior
 (according to what we did in https://github.com/pi-hole/pi-hole/pull/1291)

---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index cfcf39c9..a1ff0652 100644
--- a/settings.php
+++ b/settings.php
@@ -482,7 +482,7 @@
 			$DNSinterface = "local";
 		}
 	} else {
-		$DNSinterface = "local";
+		$DNSinterface = "single";
 	}
 ?>
 		
    

From 302a8a89b4e6639aa5a4041a769b3eece188c5cd Mon Sep 17 00:00:00 2001
From: Dan Schaper 
Date: Mon, 6 Mar 2017 09:04:08 -0800
Subject: [PATCH 057/132] Can now whitelist wildcard domains.

Signed-off-by: Dan Schaper 
---
 list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/list.php b/list.php
index afb1fb64..66cd8652 100644
--- a/list.php
+++ b/list.php
@@ -45,7 +45,7 @@ function getFullName() {
     
 
    
 
-
    Note that whitelisting domains which are blocked using the wildcard method won't work.
    
+
 
 
 
 
+    
    Note: Whitelisting a subdomain of a wildcard blocked domain is not possible.
    
 
 
 

From 8c7da67b3603019d5ec844fe8274b633687a4df6 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 14:02:17 +0100
Subject: [PATCH 059/132] Allow selection of IPv6 upstream DNS servers only if
 IPv6 scope global address has been detected

---
 settings.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/settings.php b/settings.php
index a1ff0652..b0e269f5 100644
--- a/settings.php
+++ b/settings.php
@@ -65,8 +65,22 @@
 	} else {
 		$piHoleIPv4 = "unknown";
 	}
+	$IPv6connectivity = false;
 	if(isset($setupVars["IPV6_ADDRESS"])){
 		$piHoleIPv6 = $setupVars["IPV6_ADDRESS"];
+			// Get first hextet of IPv6 address
+			sscanf($piHoleIPv6, "%2[0-9a-f]", $hexstr);
+			// Try to analyze it only if we found a prefix
+			if(strlen($hexstr) == 2)
+			{
+				// Convert HEX string to number
+				$hex = hexdec($hexstr);
+				if($hex == 0x20)
+				{
+					// Scope global address detected
+					$IPv6connectivity = true;
+				}
+			}
 	} else {
 		$piHoleIPv6 = "unknown";
 	}
@@ -506,9 +520,9 @@
 							
 							">" value="true" checked >
 							
-							">" value="true" checked >
+							">" value="true" checked disabled  >
 							
-							">" value="true" checked >
+							">" value="true" checked disabled  >
 							
 						
 						

From a8deaddc5ef835add3f6d227154858040fae36ea Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 16:45:22 +0100
Subject: [PATCH 060/132] Improve FTL information box on the Settings page

---
 scripts/pi-hole/php/header.php |  4 +++-
 settings.php                   | 30 ++++++++++++------------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 5f8826ae..e08de235 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -140,7 +140,9 @@
         }
     }
 
-    if(strpos(exec("ps -p `cat /var/run/pihole-FTL.pid` -o comm="), "pihole-FTL") !== false)
+    $FTL = false;
+    $FTLpid = file_get_contents("/var/run/pihole-FTL.pid");
+    if (file_exists( "/proc/".$FTLpid ))
     {
         $FTL = true;
     }
diff --git a/settings.php b/settings.php
index a1ff0652..93613244 100644
--- a/settings.php
+++ b/settings.php
@@ -802,17 +802,12 @@
 
 		
    
@@ -822,14 +817,13 @@ if($FTL)
 			
    
 			
    
 				FTL version: 
    
-				Process identifier (PID): 
    
-				Time FTL started: 
    
-				User / Group:  / 
-				
    (WARNING: You should not use root as user for running FTL!)
    
-				Total CPU utilization: %
    
-				Total CPU time: 
    
-				Memory utilization: %
    
-				Used memory: 
    
+				Process identifier (PID): 
    
+				Time FTL started: 
    
+				User / Group:  / 
    
+				Total CPU utilization: %
    
+				Total CPU time: 
    
+				Memory utilization: %
    
+				Used memory: 
    
 				
 			
    
 		
    

From 8e1c9368ee7928edd909cd3cb2ee1933b89d68f2 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 16:56:52 +0100
Subject: [PATCH 061/132] Test if IPv6 address is within 2000::/3 address range
 (according to RFC 4291)

---
 settings.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/settings.php b/settings.php
index b0e269f5..751ae3f1 100644
--- a/settings.php
+++ b/settings.php
@@ -68,14 +68,13 @@
 	$IPv6connectivity = false;
 	if(isset($setupVars["IPV6_ADDRESS"])){
 		$piHoleIPv6 = $setupVars["IPV6_ADDRESS"];
-			// Get first hextet of IPv6 address
-			sscanf($piHoleIPv6, "%2[0-9a-f]", $hexstr);
-			// Try to analyze it only if we found a prefix
-			if(strlen($hexstr) == 2)
+			// Test if this address is within 2000::/3 address range (Global Unicast, RFC 4291)
+			sscanf($piHoleIPv6, "%1[0-9a-f]", $hexstr);
+			if(strlen($hexstr) == 1)
 			{
 				// Convert HEX string to number
 				$hex = hexdec($hexstr);
-				if($hex == 0x20)
+				if($hex === 0b0010)
 				{
 					// Scope global address detected
 					$IPv6connectivity = true;

From e90d91635679e9e7d99d7358728713eb471cf24c Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 16:58:10 +0100
Subject: [PATCH 062/132] Strict checking for only the first three bits

---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 751ae3f1..17f73684 100644
--- a/settings.php
+++ b/settings.php
@@ -74,7 +74,7 @@
 			{
 				// Convert HEX string to number
 				$hex = hexdec($hexstr);
-				if($hex === 0b0010)
+				if(($hex & 0b0111) === 0b0010)
 				{
 					// Scope global address detected
 					$IPv6connectivity = true;

From 120c7ad6ebdded2cca862663b28984522f120e1b Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 17:07:53 +0100
Subject: [PATCH 063/132] Remove cputime display

---
 settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings.php b/settings.php
index 93613244..cd0992d3 100644
--- a/settings.php
+++ b/settings.php
@@ -821,7 +821,6 @@ if($FTL)
 				Time FTL started: 
    
 				User / Group:  / 
    
 				Total CPU utilization: %
    
-				Total CPU time: 
    
 				Memory utilization: %
    
 				Used memory: 
    
 				

From d64c0aa48fee18fd330e0a3cd96afff8b16cc76b Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 21:47:51 +0100
Subject: [PATCH 064/132] Extend test to accept both ULA and GUA addresses as
 valid IPv6 addresses

---
 settings.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/settings.php b/settings.php
index 17f73684..1e5897f8 100644
--- a/settings.php
+++ b/settings.php
@@ -68,13 +68,16 @@
 	$IPv6connectivity = false;
 	if(isset($setupVars["IPV6_ADDRESS"])){
 		$piHoleIPv6 = $setupVars["IPV6_ADDRESS"];
-			// Test if this address is within 2000::/3 address range (Global Unicast, RFC 4291)
-			sscanf($piHoleIPv6, "%1[0-9a-f]", $hexstr);
-			if(strlen($hexstr) == 1)
+			sscanf($piHoleIPv6, "%2[0-9a-f]", $hexstr);
+			if(strlen($hexstr) == 2)
 			{
 				// Convert HEX string to number
 				$hex = hexdec($hexstr);
-				if(($hex & 0b0111) === 0b0010)
+				// Global Unicast Address (2000::/3, RFC 4291)
+				$GUA = (($hex & 0b01110000) === 0b00100000);
+				// Unique Local Address   (fc00::/7, RFC 4193)
+				$ULA = (($hex & 0b11111110) === 0b11111100);
+				if($GUA || $ULA)
 				{
 					// Scope global address detected
 					$IPv6connectivity = true;

From 31e8fcfffe95598e9aa8c1bd48de7ecae5f23105 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 22:07:10 +0100
Subject: [PATCH 065/132] HEX it

---
 settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.php b/settings.php
index 1e5897f8..5eab5223 100644
--- a/settings.php
+++ b/settings.php
@@ -74,9 +74,9 @@
 				// Convert HEX string to number
 				$hex = hexdec($hexstr);
 				// Global Unicast Address (2000::/3, RFC 4291)
-				$GUA = (($hex & 0b01110000) === 0b00100000);
+				$GUA = (($hex & 0x70) === 0x20);
 				// Unique Local Address   (fc00::/7, RFC 4193)
-				$ULA = (($hex & 0b11111110) === 0b11111100);
+				$ULA = (($hex & 0xfe) === 0xfc);
 				if($GUA || $ULA)
 				{
 					// Scope global address detected

From ba9f0a995c23d0e2184a597d3498c8291cd8bfc7 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 7 Mar 2017 22:09:01 +0100
Subject: [PATCH 066/132] Connect IPv6 detection of the DHCP server

---
 settings.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/settings.php b/settings.php
index 5eab5223..3e976c49 100644
--- a/settings.php
+++ b/settings.php
@@ -126,17 +126,6 @@
 		
    
  0 && $piHoleIPv6 != "unknown")
-	{
-		if(substr($piHoleIPv6, 0, 4) != "fe80")
-		{
-			$usingipv6 = true;
-		}
-	}
-
 	if(isset($setupVars["DHCP_ACTIVE"]))
 	{
 		if($setupVars["DHCP_ACTIVE"] == 1)
@@ -171,7 +160,7 @@
 		}
 		else
 		{
-			$DHCPIPv6 = $usingipv6;
+			$DHCPIPv6 = false;
 		}
 
 	}
@@ -191,7 +180,7 @@
 			$DHCProuter = "";
 		}
 		$DHCPleasetime = 24;
-		$DHCPIPv6 = $usingipv6;
+		$DHCPIPv6 = false;
 	}
 	if(isset($setupVars["PIHOLE_DOMAIN"])){
 		$piHoleDomain = $setupVars["PIHOLE_DOMAIN"];

From 667acb90caef44e7b847f19152eae2169b9b22fe Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 10 Mar 2017 07:27:27 -0500
Subject: [PATCH 067/132] Allow block page to access queryads

Broken in https://github.com/pi-hole/AdminLTE/commit/276f2c1628ffef72c3d3ae489fd5b71ebb800227
---
 scripts/pi-hole/php/queryads.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/pi-hole/php/queryads.php b/scripts/pi-hole/php/queryads.php
index 55e8f8c2..457e235c 100644
--- a/scripts/pi-hole/php/queryads.php
+++ b/scripts/pi-hole/php/queryads.php
@@ -6,9 +6,6 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
 
-require "password.php";
-if(!$auth) die("Not authorized");
-
 ob_end_flush();
 ini_set("output_buffering", "0");
 ob_implicit_flush(true);

From 46c451b3d1f045014c6e17ab2f8d65fa93aec2f5 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 12:33:19 +0100
Subject: [PATCH 068/132] New Forwarded over Time graph

---
 api_FTL.php                 |  16 ++++
 index.php                   |   2 +-
 scripts/pi-hole/js/index.js | 179 +++++++++++++++++++++++-------------
 3 files changed, 130 insertions(+), 67 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index 23419a45..7f800d3c 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -229,5 +229,21 @@ if(isset($_GET["recentBlocked"]))
 	unset($data);
 }
 
+if (isset($_GET['overTimeDataForwards']))
+{
+	sendRequestFTL("ForwardedoverTime");
+	$return = getResponseFTL();
+
+	foreach($return as $line)
+	{
+		$tmp = explode(" ",$line);
+		for ($i=0; $i < count($tmp)-1; $i++) {
+			$over_time[intval($tmp[0])][$i] = intval($tmp[$i+1]);
+		}
+	}
+	$result = array('over_time' => $over_time);
+	$data = array_merge($data, $result);
+}
+
 disconnectFTL();
 ?>
diff --git a/index.php b/index.php
index 5ea7b172..a40f0576 100644
--- a/index.php
+++ b/index.php
@@ -108,7 +108,7 @@
     
    
     
    
         
    
-          
    Forward Destinations
    
+          
    Forward Destinations over Time
    
         
    
         
    
           
    
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index bc963aa3..13af7687 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -110,6 +110,81 @@ function updateQueriesOverTime() {
     });
 }
 
+function updateForwardedOverTime() {
+    $.getJSON("api.php?overTimeDataForwards&getForwardDestinations", function(data) {
+        // convert received objects to arrays
+        data.over_time = objectToArray(data.over_time);
+        var timestamps = data.over_time[0];
+        var plotdata  = data.over_time[1];
+        var labels = [];
+        for (var key in data.forward_destinations)
+        {
+            if(key.indexOf("|") > -1)
+            {
+                var idx = key.indexOf("|");
+                key = key.substr(0, idx)+" ("+key.substr(idx+1, key.length-idx)+")";
+            }
+            labels.push(key);
+        }
+        // Get colors from AdminLTE
+        var colors = [];
+        $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
+        var v = [], c = [], k = [];
+
+        // Collect values and colors, and labels
+
+        forwardDestinationChart.data.datasets[0].backgroundColor = colors.shift();
+        forwardDestinationChart.data.datasets[0].pointRadius = 0;
+        forwardDestinationChart.data.datasets[0].label = labels.shift();
+
+        console.log(labels);
+        for (i = 1; i < plotdata[0].length; i++)
+        {
+            forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels});
+        }
+
+        // Add data for each dataset that is available
+        console.log(timestamps);
+        for (var j in timestamps)
+        {
+            var sum = 0.0;
+            for (var i in plotdata[j])
+            {
+                sum += plotdata[j][i];
+            }
+            var dd = [];
+            for (var i in plotdata[j])
+            {
+                var singlepoint = plotdata[j][i];
+                console.log([timestamps[j],singlepoint]);
+                if(singlepoint == 0)
+                {
+                    // Don't plot this line
+                    singlepoint = NaN;
+                }
+                forwardDestinationChart.data.datasets[i].data.push(singlepoint/sum);
+            }
+
+            var d = new Date(1000*parseInt(timestamps[j]));
+            forwardDestinationChart.data.labels.push(d);
+        }
+        $("#forward-destinations .overlay").remove();
+        forwardDestinationChart.update();
+    }).done(function() {
+        // Reload graph after 10 minutes
+        failures = 0;
+        setTimeout(updateForwardedOverTime, 600000);
+    }).fail(function() {
+        failures++;
+        if(failures < 5)
+        {
+            // Try again after 1 minute only if this has not failed more
+            // than five times in a row
+            setTimeout(updateForwardedOverTime, 60000);
+        }
+    });
+}
+
 function updateQueryTypes() {
     $.getJSON("api.php?getQueryTypes", function(data) {
         var colors = [];
@@ -197,47 +272,6 @@ function updateTopClientsChart() {
     });
 }
 
-function updateForwardDestinations() {
-    $.getJSON("api.php?getForwardDestinations", function(data) {
-        var colors = [];
-        // Get colors from AdminLTE
-        $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
-        var v = [], c = [], k = [], iter;
-        // Collect values and colors, immediately push individual labels
-        if(data.hasOwnProperty("forward_destinations"))
-        {
-            iter = data.forward_destinations;
-        }
-        else
-        {
-            iter = data;
-        }
-        $.each(iter, function(key , value) {
-            v.push(value);
-            c.push(colors.shift());
-            if(key.indexOf("|") > -1)
-            {
-                var idx = key.indexOf("|");
-                key = key.substr(0, idx)+" ("+key.substr(idx+1, key.length-idx)+")";
-            }
-            k.push(key);
-        });
-        // Build a single dataset with the data to be pushed
-        var dd = {data: v, backgroundColor: c};
-        // and push it at once
-        forwardDestinationChart.data.datasets[0] = dd;
-        forwardDestinationChart.data.labels = k;
-        $("#forward-destinations .overlay").remove();
-        forwardDestinationChart.update();
-        forwardDestinationChart.chart.config.options.cutoutPercentage=50;
-        forwardDestinationChart.update();
-        // Don't use rotation animation for further updates
-        forwardDestinationChart.options.animation.duration=0;
-        // Update forward destinations data every 10 seconds
-        setTimeout(updateForwardDestinations, 10000);
-    });
-}
-
 function updateTopLists() {
     $.getJSON("api.php?summaryRaw&topItems", function(data) {
         // Clear tables before filling them with data
@@ -309,6 +343,10 @@ $(document).ready(function() {
             }
         };
 
+        // Pull in data via AJAX
+
+        updateSummaryData();
+
         var ctx = document.getElementById("queryOverTimeChart").getContext("2d");
         timeLineChart = new Chart(ctx, {
             type: "line",
@@ -400,10 +438,42 @@ $(document).ready(function() {
 
         // Pull in data via AJAX
 
-        updateSummaryData();
-
         updateQueriesOverTime();
 
+        var ctx = document.getElementById("forwardDestinationChart").getContext("2d");
+        forwardDestinationChart = new Chart(ctx, {
+            type: "line",
+            data: {
+                labels: [],
+                datasets: [{ data: [] }]
+            },
+            options: {
+                scales: {
+                    xAxes: [{
+                        type: "time",
+                        time: {
+                            unit: "hour",
+                            displayFormats: {
+                                hour: "HH:mm"
+                            },
+                            tooltipFormat: "HH:mm"
+                        }
+                    }],
+                    yAxes: [{
+                        ticks: {
+                            beginAtZero: true
+                        },
+                        stacked: true
+                    }]
+                },
+                maintainAspectRatio: false
+            }
+        });
+
+        // Pull in data via AJAX
+
+        updateForwardedOverTime();
+
         // Create / load "Query Types" only if authorized
         if(document.getElementById("queryTypeChart"))
         {
@@ -427,29 +497,6 @@ $(document).ready(function() {
             updateQueryTypes();
         }
 
-        // Create / load "Forward Destinations" only if authorized
-        if(document.getElementById("forwardDestinationChart"))
-        {
-            ctx = document.getElementById("forwardDestinationChart").getContext("2d");
-            forwardDestinationChart = new Chart(ctx, {
-                type: "doughnut",
-                data: {
-                    labels: [],
-                    datasets: [{ data: [] }]
-                },
-                options: {
-                    legend: {
-                        display: false
-                    },
-                    animation: {
-                        duration: 2000
-                    },
-                    cutoutPercentage: 0
-                }
-            });
-            updateForwardDestinations();
-        }
-
         // Create / load "Top Domains" and "Top Advertisers" only if authorized
         if(document.getElementById("domain-frequency")
             && document.getElementById("ad-frequency"))

From 3e9b4692e44be003c2d11f7c084f43ca13134092 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 12:35:40 +0100
Subject: [PATCH 069/132] Remove debug statements....

---
 scripts/pi-hole/js/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 13af7687..3f5881eb 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -137,14 +137,12 @@ function updateForwardedOverTime() {
         forwardDestinationChart.data.datasets[0].pointRadius = 0;
         forwardDestinationChart.data.datasets[0].label = labels.shift();
 
-        console.log(labels);
         for (i = 1; i < plotdata[0].length; i++)
         {
             forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels});
         }
 
         // Add data for each dataset that is available
-        console.log(timestamps);
         for (var j in timestamps)
         {
             var sum = 0.0;
@@ -156,7 +154,6 @@ function updateForwardedOverTime() {
             for (var i in plotdata[j])
             {
                 var singlepoint = plotdata[j][i];
-                console.log([timestamps[j],singlepoint]);
                 if(singlepoint == 0)
                 {
                     // Don't plot this line
@@ -466,7 +463,7 @@ $(document).ready(function() {
                         stacked: true
                     }]
                 },
-                maintainAspectRatio: false
+                maintainAspectRatio: true
             }
         });
 

From 3680da0388934fc4773eeeead508cf5afe1c733d Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 12:45:06 +0100
Subject: [PATCH 070/132] codacy fixes

---
 scripts/pi-hole/js/index.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 3f5881eb..51c10dee 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -119,6 +119,7 @@ function updateForwardedOverTime() {
         var labels = [];
         for (var key in data.forward_destinations)
         {
+            if (!{}.hasOwnProperty.call(data.forward_destinations, key)) continue;
             if(key.indexOf("|") > -1)
             {
                 var idx = key.indexOf("|");
@@ -137,7 +138,7 @@ function updateForwardedOverTime() {
         forwardDestinationChart.data.datasets[0].pointRadius = 0;
         forwardDestinationChart.data.datasets[0].label = labels.shift();
 
-        for (i = 1; i < plotdata[0].length; i++)
+        for (var i = 1; i < plotdata[0].length; i++)
         {
             forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels});
         }
@@ -145,6 +146,7 @@ function updateForwardedOverTime() {
         // Add data for each dataset that is available
         for (var j in timestamps)
         {
+            if (!{}.hasOwnProperty.call(timestamps, j)) continue;
             var sum = 0.0;
             for (var i in plotdata[j])
             {
@@ -153,8 +155,9 @@ function updateForwardedOverTime() {
             var dd = [];
             for (var i in plotdata[j])
             {
+                if (!{}.hasOwnProperty.call(plotdata[j], i)) continue;
                 var singlepoint = plotdata[j][i];
-                if(singlepoint == 0)
+                if(singlepoint === 0)
                 {
                     // Don't plot this line
                     singlepoint = NaN;
@@ -437,7 +440,7 @@ $(document).ready(function() {
 
         updateQueriesOverTime();
 
-        var ctx = document.getElementById("forwardDestinationChart").getContext("2d");
+        ctx = document.getElementById("forwardDestinationChart").getContext("2d");
         forwardDestinationChart = new Chart(ctx, {
             type: "line",
             data: {

From 6beeedc73251278fc18df9c364e1874ac1ccde6c Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 12:55:58 +0100
Subject: [PATCH 071/132] More codacy

---
 scripts/pi-hole/js/index.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 51c10dee..16c9d66f 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -148,21 +148,23 @@ function updateForwardedOverTime() {
         {
             if (!{}.hasOwnProperty.call(timestamps, j)) continue;
             var sum = 0.0;
-            for (var i in plotdata[j])
+            var key;
+            for (key in plotdata[j])
             {
-                sum += plotdata[j][i];
+                if (!{}.hasOwnProperty.call(plotdata[j], key)) continue;
+                sum += plotdata[j][key];
             }
             var dd = [];
-            for (var i in plotdata[j])
+            for (key in plotdata[j])
             {
-                if (!{}.hasOwnProperty.call(plotdata[j], i)) continue;
-                var singlepoint = plotdata[j][i];
+                if (!{}.hasOwnProperty.call(plotdata[j], key)) continue;
+                var singlepoint = plotdata[j][key];
                 if(singlepoint === 0)
                 {
                     // Don't plot this line
                     singlepoint = NaN;
                 }
-                forwardDestinationChart.data.datasets[i].data.push(singlepoint/sum);
+                forwardDestinationChart.data.datasets[key].data.push(singlepoint/sum);
             }
 
             var d = new Date(1000*parseInt(timestamps[j]));

From 4b8ffd0f42c91b61ae9b506b919d206bdf0d5b4b Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 13:05:45 +0100
Subject: [PATCH 072/132] Yet another

---
 scripts/pi-hole/js/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 16c9d66f..f03a3e7a 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -117,7 +117,8 @@ function updateForwardedOverTime() {
         var timestamps = data.over_time[0];
         var plotdata  = data.over_time[1];
         var labels = [];
-        for (var key in data.forward_destinations)
+        var key, i, j;
+        for (key in data.forward_destinations)
         {
             if (!{}.hasOwnProperty.call(data.forward_destinations, key)) continue;
             if(key.indexOf("|") > -1)
@@ -138,17 +139,16 @@ function updateForwardedOverTime() {
         forwardDestinationChart.data.datasets[0].pointRadius = 0;
         forwardDestinationChart.data.datasets[0].label = labels.shift();
 
-        for (var i = 1; i < plotdata[0].length; i++)
+        for (i = 1; i < plotdata[0].length; i++)
         {
             forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels});
         }
 
         // Add data for each dataset that is available
-        for (var j in timestamps)
+        for (j in timestamps)
         {
             if (!{}.hasOwnProperty.call(timestamps, j)) continue;
             var sum = 0.0;
-            var key;
             for (key in plotdata[j])
             {
                 if (!{}.hasOwnProperty.call(plotdata[j], key)) continue;

From 5d75ab036772701debf2a641160de9b4ea4cfb30 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 13:12:21 +0100
Subject: [PATCH 073/132] Fix labels

---
 scripts/pi-hole/js/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index f03a3e7a..271fb4f7 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -137,11 +137,11 @@ function updateForwardedOverTime() {
 
         forwardDestinationChart.data.datasets[0].backgroundColor = colors.shift();
         forwardDestinationChart.data.datasets[0].pointRadius = 0;
-        forwardDestinationChart.data.datasets[0].label = labels.shift();
+        forwardDestinationChart.data.datasets[0].label = labels[0];
 
         for (i = 1; i < plotdata[0].length; i++)
         {
-            forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels});
+            forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels[i]});
         }
 
         // Add data for each dataset that is available

From 165a8da66fc08146d976e1f47436cddd4c01b212 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 13:38:01 +0100
Subject: [PATCH 074/132] Empty plot data before updating

---
 scripts/pi-hole/js/index.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 271fb4f7..97b8dfc2 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -133,15 +133,22 @@ function updateForwardedOverTime() {
         $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
         var v = [], c = [], k = [];
 
-        // Collect values and colors, and labels
+        // Remove possibly already existing data
+        forwardDestinationChart.data.labels = [];
+        forwardDestinationChart.data.datasets[0].data = [];
+        for (i = 1; i < forwardDestinationChart.data.datasets.length; i++)
+        {
+            forwardDestinationChart.data.datasets[i].data = [];
+        }
 
-        forwardDestinationChart.data.datasets[0].backgroundColor = colors.shift();
+        // Collect values and colors, and labels
+        forwardDestinationChart.data.datasets[0].backgroundColor = colors[0];
         forwardDestinationChart.data.datasets[0].pointRadius = 0;
         forwardDestinationChart.data.datasets[0].label = labels[0];
 
-        for (i = 1; i < plotdata[0].length; i++)
+        for (i = forwardDestinationChart.data.datasets.length; i < plotdata[0].length; i++)
         {
-            forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors.shift(), pointRadius: 0, label: labels[i]});
+            forwardDestinationChart.data.datasets.push({data: [], backgroundColor: colors[i], pointRadius: 0, label: labels[i]});
         }
 
         // Add data for each dataset that is available

From 93698f0c00822abbeaa0b24621d3352c6bc0e96b Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 13 Mar 2017 15:32:15 +0100
Subject: [PATCH 075/132] Fix axis to [0,1] and use unsorted list of forward
 destinations for the labels

---
 api_FTL.php                 | 22 ++++++++++++++++++++++
 scripts/pi-hole/js/index.js |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/api_FTL.php b/api_FTL.php
index 7f800d3c..5e92787c 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -245,5 +245,27 @@ if (isset($_GET['overTimeDataForwards']))
 	$data = array_merge($data, $result);
 }
 
+if (isset($_GET['getForwardDestinationNames']) && $auth)
+{
+	sendRequestFTL("forward-names");
+	$return = getResponseFTL();
+	$forward_dest = array();
+	foreach($return as $line)
+	{
+		$tmp = explode(" ",$line);
+		if(count($tmp) == 4)
+		{
+			$forward_dest[$tmp[3]."|".$tmp[2]] = intval($tmp[1]);
+		}
+		else
+		{
+			$forward_dest[$tmp[2]] = intval($tmp[1]);
+		}
+	}
+
+	$result = array('forward_destinations' => $forward_dest);
+	$data = array_merge($data, $result);
+}
+
 disconnectFTL();
 ?>
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 97b8dfc2..8fdbde5d 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -111,7 +111,7 @@ function updateQueriesOverTime() {
 }
 
 function updateForwardedOverTime() {
-    $.getJSON("api.php?overTimeDataForwards&getForwardDestinations", function(data) {
+    $.getJSON("api.php?overTimeDataForwards&getForwardDestinationNames", function(data) {
         // convert received objects to arrays
         data.over_time = objectToArray(data.over_time);
         var timestamps = data.over_time[0];
@@ -470,6 +470,8 @@ $(document).ready(function() {
                     }],
                     yAxes: [{
                         ticks: {
+                            mix: 0.0,
+                            max: 1.0,
                             beginAtZero: true
                         },
                         stacked: true

From 7627f35ba52574c43c98dd1c75c115ff04a7cdf3 Mon Sep 17 00:00:00 2001
From: Skittels 
Date: Tue, 14 Mar 2017 20:21:57 +0100
Subject: [PATCH 076/132] Update savesettings.php

---
 scripts/pi-hole/php/savesettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index cb8f479b..cc02ffc6 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -118,7 +118,7 @@ function isinserverlist($addr) {
 
 	$DNSserverslist = [
 			"Google" => ["v4_1" => "8.8.8.8","v4_2" => "8.8.4.4", "v6_1" => "2001:4860:4860:0:0:0:0:8888", "v6_2" => "2001:4860:4860:0:0:0:0:8844"],
-			"OpenDNS" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220"],
+			"OpenDNS" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220", "v6_1" => "2620:0:ccc::2", "v6_2" => "2620:0:ccd::2"],
 			"Level3" => ["v4_1" => "4.2.2.1", "v4_2" => "4.2.2.2"],
 			"Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"],
 			"Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"],

From 12d56dee13a05481884013036f67a84d14cc5acb Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Thu, 16 Mar 2017 17:37:30 -0400
Subject: [PATCH 077/132] Change padlock to key in login page

---
 scripts/pi-hole/php/loginpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 856d69a5..53aa2377 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -25,7 +25,7 @@
       
         
    
           
-          
+          
         
    
         
    
           
    

From a540e2d3205b409084ebc46b5ea8f7ed76752856 Mon Sep 17 00:00:00 2001
From: Jacob Salmela 
Date: Thu, 16 Mar 2017 20:55:37 -0500
Subject: [PATCH 078/132] change H to lowercase to match brand

---
 scripts/pi-hole/php/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index e2e796e6..40a008c8 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -197,7 +197,7 @@
         
         

From 44d5b9653e238a7b66e349b495fdc9d9fb531684 Mon Sep 17 00:00:00 2001
From: Anthony Giorgio 
Date: Sat, 18 Mar 2017 08:05:06 -0400
Subject: [PATCH 079/132] Fix spelling

---
 scripts/pi-hole/php/loginpage.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 53aa2377..393bf1db 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -54,9 +54,8 @@
               
    
               
    
                 After installing Pi-Hole for the first time, a password is generated and displayed to the user. The
-                password cannot be retrived later on, but it is possible to set a new password (or explicitly disable
-                the
-                password by setting an empty password) using the command
+                password cannot be retrieved later on, but it is possible to set a new password (or explicitly disable
+                the password by setting an empty password) using the command
                 
    sudo pihole -a -p newpassword
    
               
    
             
    

From c182834e5565bc7a21dab19530a92d78c4dcf2e3 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Tue, 21 Mar 2017 18:35:32 -0400
Subject: [PATCH 080/132] Fix undefined variable when setting DNS servers

---
 scripts/pi-hole/php/savesettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index cc02ffc6..13c60862 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -228,7 +228,7 @@ function isinserverlist($addr) {
 				if(!strlen($error))
 				{
 					$IPs = implode (",", $DNSservers);
-					exec("sudo pihole -a setdns ".$IPs." ".$extra);
+					$return = exec("sudo pihole -a setdns ".$IPs." ".$extra);
 					$success .= htmlspecialchars($return)."
    ";
 					$success .= "The DNS settings have been updated (using ".count($DNSservers)." DNS servers)";
 				}

From 35dcb9b5ed7c6c6c200008b07f718bef1ee1a9e0 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 21:30:03 +0100
Subject: [PATCH 081/132] Improve fallback handling of the dashboard for when
 FTL is not running

---
 api.php                     | 13 +++++--
 scripts/pi-hole/js/index.js | 76 ++++++++++++++++++++++++++++++++-----
 2 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/api.php b/api.php
index d75b55ff..d9fe1433 100644
--- a/api.php
+++ b/api.php
@@ -62,13 +62,20 @@ elseif (isset($_GET['disable']) && $auth)
 }
 
 // Other API functions
-if(testFTL() && !isset($_GET["PHP"]))
+if(!testFTL() && !isset($_GET["PHP"]))
 {
-	require("api_FTL.php");
+	$data = array_merge($data, array("FTLnotrunning" => true));
 }
 else
 {
-	require("api_PHP.php");
+	if(!isset($_GET["PHP"]))
+	{
+		require("api_FTL.php");
+	}
+	else
+	{
+		require("api_PHP.php");
+	}
 }
 
 if(isset($_GET["jsonForceObject"]))
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 8fdbde5d..75a45112 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -38,6 +38,18 @@ function updateSummaryData(runOnce) {
     };
     $.getJSON("api.php?summary", function LoadSummaryData(data) {
 
+        updateSessionTimer();
+
+        if("FTLnotrunning" in data)
+        {
+            // Try again in ten seconds
+            setTimer(10);
+            data["ads_blocked_today"] = "---";
+            data["dns_queries_today"] = "---";
+            data["domains_being_blocked"] = "---";
+            data["ads_percentage_today"] = "---";
+        }
+
         ["ads_blocked_today", "dns_queries_today", "ads_percentage_today"].forEach(function(today) {
             var todayElement = $("h3#" + today);
             todayElement.text() !== data[today] && todayElement.addClass("glow");
@@ -45,13 +57,12 @@ function updateSummaryData(runOnce) {
 
         window.setTimeout(function() {
             ["ads_blocked_today", "dns_queries_today", "domains_being_blocked", "ads_percentage_today"].forEach(function(header, idx) {
-                var textData = idx === 3 ? data[header] + "%" : data[header];
+                var textData = (idx === 3 && data[header] !== "---") ? data[header] + "%" : data[header];
                 $("h3#" + header).text(textData);
             });
             $("h3.statistic.glow").removeClass("glow");
         }, 500);
 
-        updateSessionTimer();
     }).done(function() {
         setTimer(10);
     }).fail(function() {
@@ -62,6 +73,15 @@ function updateSummaryData(runOnce) {
 var failures = 0;
 function updateQueriesOverTime() {
     $.getJSON("api.php?overTimeData10mins", function(data) {
+
+        if("FTLnotrunning" in data)
+        {
+            // Show spinner
+            $("#queries-over-time .overlay").show();
+            // Try again in ten seconds
+            setTimeout(updateQueriesOverTime, 10000);
+            return;
+        }
         // convert received objects to arrays
         data.domains_over_time = objectToArray(data.domains_over_time);
         data.ads_over_time = objectToArray(data.ads_over_time);
@@ -93,7 +113,7 @@ function updateQueriesOverTime() {
                 timeLineChart.data.datasets[1].data.push(data.ads_over_time[1][hour]);
             }
         }
-        $("#queries-over-time .overlay").remove();
+        $("#queries-over-time .overlay").hide();
         timeLineChart.update();
     }).done(function() {
         // Reload graph after 10 minutes
@@ -112,6 +132,15 @@ function updateQueriesOverTime() {
 
 function updateForwardedOverTime() {
     $.getJSON("api.php?overTimeDataForwards&getForwardDestinationNames", function(data) {
+
+        if("FTLnotrunning" in data)
+        {
+            // Show spinner
+            $("#forward-destinations .overlay").show();
+            // Try again in ten seconds
+            setTimeout(updateForwardedOverTime, 10000);
+            return;
+        }
         // convert received objects to arrays
         data.over_time = objectToArray(data.over_time);
         var timestamps = data.over_time[0];
@@ -177,7 +206,7 @@ function updateForwardedOverTime() {
             var d = new Date(1000*parseInt(timestamps[j]));
             forwardDestinationChart.data.labels.push(d);
         }
-        $("#forward-destinations .overlay").remove();
+        $("#forward-destinations .overlay").hide();
         forwardDestinationChart.update();
     }).done(function() {
         // Reload graph after 10 minutes
@@ -196,6 +225,15 @@ function updateForwardedOverTime() {
 
 function updateQueryTypes() {
     $.getJSON("api.php?getQueryTypes", function(data) {
+
+        if("FTLnotrunning" in data)
+        {
+            // Show spinner
+            $("#query-types .overlay").show();
+            // Try again in ten seconds
+            setTimeout(updateQueryTypes, 10000);
+            return;
+        }
         var colors = [];
         // Get colors from AdminLTE
         $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
@@ -219,7 +257,7 @@ function updateQueryTypes() {
         // and push it at once
         queryTypeChart.data.datasets[0] = dd;
         queryTypeChart.data.labels = k;
-        $("#query-types .overlay").remove();
+        $("#query-types .overlay").hide();
         queryTypeChart.update();
         queryTypeChart.chart.config.options.cutoutPercentage=50;
         queryTypeChart.update();
@@ -245,6 +283,15 @@ function escapeHtml(text) {
 
 function updateTopClientsChart() {
     $.getJSON("api.php?summaryRaw&getQuerySources", function(data) {
+
+        if("FTLnotrunning" in data)
+        {
+            // Show spinner
+            $("#client-frequency .overlay").show();
+            // Try again in ten seconds
+            setTimeout(updateTopClientsChart, 10000);
+            return;
+        }
         // Clear tables before filling them with data
         $("#client-frequency td").parent().remove();
         var clienttable =  $("#client-frequency").find("tbody:last");
@@ -275,14 +322,23 @@ function updateTopClientsChart() {
 
         }
 
-        $("#client-frequency .overlay").remove();
-        // Update top clients list data every 10 seconds
-        setTimeout(updateTopClientsChart, 10000);
+        $("#client-frequency .overlay").hide();
+        // Update top clients list data every second
+        setTimeout(updateTopClientsChart, 1000);
     });
 }
 
 function updateTopLists() {
     $.getJSON("api.php?summaryRaw&topItems", function(data) {
+        if("FTLnotrunning" in data)
+        {
+            // Show spinner
+            $("#domain-frequency .overlay").show();
+            $("#ad-frequency .overlay").show();
+            // Try again in ten seconds
+            setTimeout(updateTopLists, 10000);
+            return;
+        }
         // Clear tables before filling them with data
         $("#domain-frequency td").parent().remove();
         $("#ad-frequency td").parent().remove();
@@ -325,8 +381,8 @@ function updateTopLists() {
             $("#ad-frequency").parent().remove();
         }
 
-        $("#domain-frequency .overlay").remove();
-        $("#ad-frequency .overlay").remove();
+        $("#domain-frequency .overlay").hide();
+        $("#ad-frequency .overlay").hide();
         // Update top lists data every 10 seconds
         setTimeout(updateTopLists, 10000);
     });

From 17fb960a011e0c1f23182d7aea41e68d3994069c Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 21:35:16 +0100
Subject: [PATCH 082/132] Update statistics every second

---
 scripts/pi-hole/js/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 75a45112..647e07cb 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -64,7 +64,7 @@ function updateSummaryData(runOnce) {
         }, 500);
 
     }).done(function() {
-        setTimer(10);
+        setTimer(1);
     }).fail(function() {
         setTimer(300);
     });
@@ -323,8 +323,8 @@ function updateTopClientsChart() {
         }
 
         $("#client-frequency .overlay").hide();
-        // Update top clients list data every second
-        setTimeout(updateTopClientsChart, 1000);
+        // Update top clients list data every ten seconds
+        setTimeout(updateTopClientsChart, 10000);
     });
 }
 

From ebef61614d46ab8f3bef0967f5ee7590decee02d Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 21:57:44 +0100
Subject: [PATCH 083/132] Handle FTL offline notification and instant refresh
 when it becomes available

---
 scripts/pi-hole/js/index.js    | 59 +++++++++++++++++++---------------
 scripts/pi-hole/php/header.php |  2 +-
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 647e07cb..366e4773 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -42,12 +42,34 @@ function updateSummaryData(runOnce) {
 
         if("FTLnotrunning" in data)
         {
+            data["ads_blocked_today"] = "No";
+            data["dns_queries_today"] = "FTL";
+            data["ads_percentage_today"] = "power";
+            data["domains_being_blocked"] = "available";
+            // Adjust text
+            $("#temperature").html(" FTL offline");
+            // Show spinner
+            $("#queries-over-time .overlay").show();
+            $("#forward-destinations .overlay").show();
+            $("#query-types .overlay").show();
+            $("#client-frequency .overlay").show();
+            $("#domain-frequency .overlay").show();
+            $("#ad-frequency .overlay").show();
             // Try again in ten seconds
             setTimer(10);
-            data["ads_blocked_today"] = "---";
-            data["dns_queries_today"] = "---";
-            data["domains_being_blocked"] = "---";
-            data["ads_percentage_today"] = "---";
+        }
+        else
+        {
+            if($("#temperature").text().search("FTL offline") > -1)
+            {
+                // FTL was previously offline
+                $("#temperature").text(" ");
+                updateQueriesOverTime();
+                updateForwardedOverTime();
+                updateQueryTypes();
+                updateTopClientsChart();
+                updateTopLists();
+            }
         }
 
         ["ads_blocked_today", "dns_queries_today", "ads_percentage_today"].forEach(function(today) {
@@ -57,7 +79,7 @@ function updateSummaryData(runOnce) {
 
         window.setTimeout(function() {
             ["ads_blocked_today", "dns_queries_today", "domains_being_blocked", "ads_percentage_today"].forEach(function(header, idx) {
-                var textData = (idx === 3 && data[header] !== "---") ? data[header] + "%" : data[header];
+                var textData = (idx === 3 && data[header] !== "power") ? data[header] + "%" : data[header];
                 $("h3#" + header).text(textData);
             });
             $("h3.statistic.glow").removeClass("glow");
@@ -76,12 +98,9 @@ function updateQueriesOverTime() {
 
         if("FTLnotrunning" in data)
         {
-            // Show spinner
-            $("#queries-over-time .overlay").show();
-            // Try again in ten seconds
-            setTimeout(updateQueriesOverTime, 10000);
             return;
         }
+
         // convert received objects to arrays
         data.domains_over_time = objectToArray(data.domains_over_time);
         data.ads_over_time = objectToArray(data.ads_over_time);
@@ -135,12 +154,9 @@ function updateForwardedOverTime() {
 
         if("FTLnotrunning" in data)
         {
-            // Show spinner
-            $("#forward-destinations .overlay").show();
-            // Try again in ten seconds
-            setTimeout(updateForwardedOverTime, 10000);
             return;
         }
+
         // convert received objects to arrays
         data.over_time = objectToArray(data.over_time);
         var timestamps = data.over_time[0];
@@ -228,12 +244,9 @@ function updateQueryTypes() {
 
         if("FTLnotrunning" in data)
         {
-            // Show spinner
-            $("#query-types .overlay").show();
-            // Try again in ten seconds
-            setTimeout(updateQueryTypes, 10000);
             return;
         }
+
         var colors = [];
         // Get colors from AdminLTE
         $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
@@ -286,12 +299,9 @@ function updateTopClientsChart() {
 
         if("FTLnotrunning" in data)
         {
-            // Show spinner
-            $("#client-frequency .overlay").show();
-            // Try again in ten seconds
-            setTimeout(updateTopClientsChart, 10000);
             return;
         }
+
         // Clear tables before filling them with data
         $("#client-frequency td").parent().remove();
         var clienttable =  $("#client-frequency").find("tbody:last");
@@ -330,15 +340,12 @@ function updateTopClientsChart() {
 
 function updateTopLists() {
     $.getJSON("api.php?summaryRaw&topItems", function(data) {
+
         if("FTLnotrunning" in data)
         {
-            // Show spinner
-            $("#domain-frequency .overlay").show();
-            $("#ad-frequency .overlay").show();
-            // Try again in ten seconds
-            setTimeout(updateTopLists, 10000);
             return;
         }
+
         // Clear tables before filling them with data
         $("#domain-frequency td").parent().remove();
         $("#ad-frequency td").parent().remove();
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 4c4d6e25..cb56f1e5 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -323,7 +323,7 @@
                         }
                         else
                         {
-                            echo ' FTL offline';
+                            echo ' FTL offline';
                         }
                     ?>
                     
    

From 8d4864eb17949c3ee3d8396c58723ee8743fd3be Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 22:01:58 +0100
Subject: [PATCH 084/132] Add delay of 0.5 sec before trying to load all data

---
 scripts/pi-hole/js/index.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 366e4773..ca060818 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -64,11 +64,13 @@ function updateSummaryData(runOnce) {
             {
                 // FTL was previously offline
                 $("#temperature").text(" ");
-                updateQueriesOverTime();
-                updateForwardedOverTime();
-                updateQueryTypes();
-                updateTopClientsChart();
-                updateTopLists();
+                window.setTimeout(function() {
+	                updateQueriesOverTime();
+	                updateForwardedOverTime();
+	                updateQueryTypes();
+	                updateTopClientsChart();
+	                updateTopLists();
+	            }, 500);
             }
         }
 

From 0043c229d56eeaef721e902914d401c5828f2a2e Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 22:21:30 +0100
Subject: [PATCH 085/132] Change logic

---
 scripts/pi-hole/js/index.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index ca060818..27260f1b 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -29,7 +29,7 @@ function objectToArray(p){
 
 // Functions to update data in page
 
-
+var FTLoffline = false;
 function updateSummaryData(runOnce) {
     var setTimer = function(timeInSeconds) {
         if (!runOnce) {
@@ -55,22 +55,21 @@ function updateSummaryData(runOnce) {
             $("#client-frequency .overlay").show();
             $("#domain-frequency .overlay").show();
             $("#ad-frequency .overlay").show();
-            // Try again in ten seconds
-            setTimer(10);
+
+            FTLoffline = true;
         }
         else
         {
-            if($("#temperature").text().search("FTL offline") > -1)
+            if(FTLoffline)
             {
                 // FTL was previously offline
+                FTLoffline = false;
                 $("#temperature").text(" ");
-                window.setTimeout(function() {
-	                updateQueriesOverTime();
-	                updateForwardedOverTime();
-	                updateQueryTypes();
-	                updateTopClientsChart();
-	                updateTopLists();
-	            }, 500);
+                updateQueriesOverTime();
+                updateForwardedOverTime();
+                updateQueryTypes();
+                updateTopClientsChart();
+                updateTopLists();
             }
         }
 

From 8b91c8c12e29b97d70d2297907adef30f62ddabb Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 23:21:15 +0100
Subject: [PATCH 086/132] Codacy and changed text

---
 scripts/pi-hole/js/index.js | 128 ++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 27260f1b..1bf21a15 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -29,70 +29,6 @@ function objectToArray(p){
 
 // Functions to update data in page
 
-var FTLoffline = false;
-function updateSummaryData(runOnce) {
-    var setTimer = function(timeInSeconds) {
-        if (!runOnce) {
-            setTimeout(updateSummaryData, timeInSeconds * 1000);
-        }
-    };
-    $.getJSON("api.php?summary", function LoadSummaryData(data) {
-
-        updateSessionTimer();
-
-        if("FTLnotrunning" in data)
-        {
-            data["ads_blocked_today"] = "No";
-            data["dns_queries_today"] = "FTL";
-            data["ads_percentage_today"] = "power";
-            data["domains_being_blocked"] = "available";
-            // Adjust text
-            $("#temperature").html(" FTL offline");
-            // Show spinner
-            $("#queries-over-time .overlay").show();
-            $("#forward-destinations .overlay").show();
-            $("#query-types .overlay").show();
-            $("#client-frequency .overlay").show();
-            $("#domain-frequency .overlay").show();
-            $("#ad-frequency .overlay").show();
-
-            FTLoffline = true;
-        }
-        else
-        {
-            if(FTLoffline)
-            {
-                // FTL was previously offline
-                FTLoffline = false;
-                $("#temperature").text(" ");
-                updateQueriesOverTime();
-                updateForwardedOverTime();
-                updateQueryTypes();
-                updateTopClientsChart();
-                updateTopLists();
-            }
-        }
-
-        ["ads_blocked_today", "dns_queries_today", "ads_percentage_today"].forEach(function(today) {
-            var todayElement = $("h3#" + today);
-            todayElement.text() !== data[today] && todayElement.addClass("glow");
-        });
-
-        window.setTimeout(function() {
-            ["ads_blocked_today", "dns_queries_today", "domains_being_blocked", "ads_percentage_today"].forEach(function(header, idx) {
-                var textData = (idx === 3 && data[header] !== "power") ? data[header] + "%" : data[header];
-                $("h3#" + header).text(textData);
-            });
-            $("h3.statistic.glow").removeClass("glow");
-        }, 500);
-
-    }).done(function() {
-        setTimer(1);
-    }).fail(function() {
-        setTimer(300);
-    });
-}
-
 var failures = 0;
 function updateQueriesOverTime() {
     $.getJSON("api.php?overTimeData10mins", function(data) {
@@ -396,6 +332,70 @@ function updateTopLists() {
     });
 }
 
+var FTLoffline = false;
+function updateSummaryData(runOnce) {
+    var setTimer = function(timeInSeconds) {
+        if (!runOnce) {
+            setTimeout(updateSummaryData, timeInSeconds * 1000);
+        }
+    };
+    $.getJSON("api.php?summary", function LoadSummaryData(data) {
+
+        updateSessionTimer();
+
+        if("FTLnotrunning" in data)
+        {
+            data["ads_blocked_today"] = "Lost";
+            data["dns_queries_today"] = "connection";
+            data["ads_percentage_today"] = "to";
+            data["domains_being_blocked"] = "API";
+            // Adjust text
+            $("#temperature").html(" FTL offline");
+            // Show spinner
+            $("#queries-over-time .overlay").show();
+            $("#forward-destinations .overlay").show();
+            $("#query-types .overlay").show();
+            $("#client-frequency .overlay").show();
+            $("#domain-frequency .overlay").show();
+            $("#ad-frequency .overlay").show();
+
+            FTLoffline = true;
+        }
+        else
+        {
+            if(FTLoffline)
+            {
+                // FTL was previously offline
+                FTLoffline = false;
+                $("#temperature").text(" ");
+                updateQueriesOverTime();
+                updateForwardedOverTime();
+                updateQueryTypes();
+                updateTopClientsChart();
+                updateTopLists();
+            }
+        }
+
+        ["ads_blocked_today", "dns_queries_today", "ads_percentage_today"].forEach(function(today) {
+            var todayElement = $("h3#" + today);
+            todayElement.text() !== data[today] && todayElement.addClass("glow");
+        });
+
+        window.setTimeout(function() {
+            ["ads_blocked_today", "dns_queries_today", "domains_being_blocked", "ads_percentage_today"].forEach(function(header, idx) {
+                var textData = (idx === 3 && data[header] !== "to") ? data[header] + "%" : data[header];
+                $("h3#" + header).text(textData);
+            });
+            $("h3.statistic.glow").removeClass("glow");
+        }, 500);
+
+    }).done(function() {
+        setTimer(1);
+    }).fail(function() {
+        setTimer(300);
+    });
+}
+
 $(document).ready(function() {
 
         var isMobile = {

From 0fde8e0dca8e82341f8f6b9a25026e2acf8b3d69 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 24 Mar 2017 16:27:37 -0400
Subject: [PATCH 087/132] Add status API method

---
 api.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/api.php b/api.php
index d9fe1433..d6d68c34 100644
--- a/api.php
+++ b/api.php
@@ -17,7 +17,19 @@ check_cors();
 $data = array();
 
 // Common API functions
-if (isset($_GET['enable']) && $auth)
+if (isset($_GET['status']) && $auth)
+{
+	$pistatus = exec('sudo pihole status web');
+	if ($pistatus == "1")
+	{
+		$data = array_merge($data, array("status" => "enabled"));
+	}
+	else
+	{
+		$data = array_merge($data, array("status" => "disabled"));
+	}
+}
+elseif (isset($_GET['enable']) && $auth)
 {
 	if(isset($_GET["auth"]))
 	{

From 3ff43542f947c2a63f474f05572250eba1570da1 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 24 Mar 2017 23:49:49 +0100
Subject: [PATCH 088/132] Require auth for API command overTimeDataForwards

---
 api_FTL.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api_FTL.php b/api_FTL.php
index 5e92787c..a4fcb766 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -229,7 +229,7 @@ if(isset($_GET["recentBlocked"]))
 	unset($data);
 }
 
-if (isset($_GET['overTimeDataForwards']))
+if (isset($_GET['overTimeDataForwards']) && $auth)
 {
 	sendRequestFTL("ForwardedoverTime");
 	$return = getResponseFTL();

From 57e2039a39c88e84cf87d7d8a91882b008dc44c1 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Sat, 25 Mar 2017 12:45:07 +0100
Subject: [PATCH 089/132] Don't add glow property for percentage if not changed

---
 scripts/pi-hole/js/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 1bf21a15..7230e27a 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -378,7 +378,9 @@ function updateSummaryData(runOnce) {
 
         ["ads_blocked_today", "dns_queries_today", "ads_percentage_today"].forEach(function(today) {
             var todayElement = $("h3#" + today);
-            todayElement.text() !== data[today] && todayElement.addClass("glow");
+            todayElement.text() !== data[today] &&
+            todayElement.text() !== data[today] + "%" &&
+            todayElement.addClass("glow");
         });
 
         window.setTimeout(function() {

From 30b7b0d63a59ef6f39a3d69291660d6b4b3f2c42 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Sun, 26 Mar 2017 13:42:29 +0200
Subject: [PATCH 090/132] Show FTL version and update notification (if
 available) in footer

---
 scripts/pi-hole/js/footer.js   | 12 ++++++++++--
 scripts/pi-hole/js/index.js    |  9 ++++++++-
 scripts/pi-hole/php/footer.php | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index 20866b85..e6c3c157 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -144,6 +144,7 @@ $("#pihole-disable-custom").on("click", function(e){
 
 var piholeVersion = $("#piholeVersion").html();
 var webVersion = $("#webVersion").html();
+var FTLVersion = $("#FTLVersion").html();
 
 // Credit for following function: https://gist.github.com/alexey-bass/1115557
 // Modified to discard any possible "v" in the string
@@ -183,17 +184,24 @@ function versionCompare(left, right) {
 $.getJSON("https://api.github.com/repos/pi-hole/pi-hole/releases/latest", function(json) {
     if(versionCompare(piholeVersion, json.tag_name.slice(1)) < 0) {
         // Alert user
-        $("#piholeVersion").html($("#piholeVersion").text() + "(Update available!)");
+        $("#piholeVersion").html($("#piholeVersion").text() + " (Update available!)");
         $("#alPiholeUpdate").show();
     }
 });
 $.getJSON("https://api.github.com/repos/pi-hole/AdminLTE/releases/latest", function(json) {
     if(versionCompare(webVersion, json.tag_name.slice(1)) < 0) {
         // Alert user
-        $("#webVersion").html($("#webVersion").text() + "(Update available!)");
+        $("#webVersion").html($("#webVersion").text() + " (Update available!)");
         $("#alWebUpdate").show();
     }
 });
+$.getJSON("https://api.github.com/repos/pi-hole/FTL/releases/latest", function(json) {
+    if(versionCompare(FTLVersion, json.tag_name.slice(1)) < 0) {
+        // Alert user
+        $("#FTLVersion").html($("#FTLVersion").text() + " (Update available!)");
+        $("#alFTLUpdate").show();
+    }
+});
 
 /*
  * Make sure that Pi-hole is updated to at least v2.7, since that is needed to use the sudo
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 1bf21a15..26370d5c 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -390,7 +390,14 @@ function updateSummaryData(runOnce) {
         }, 500);
 
     }).done(function() {
-        setTimer(1);
+        if(FTLoffline)
+        {
+          setTimer(1);
+        }
+        else
+        {
+          setTimer(10);
+        }
     }).fail(function() {
         setTimer(300);
     });
diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
index 34d7319f..50ebc210 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -62,10 +62,25 @@
             else {
                 $webVersion = exec("git describe --tags --abbrev=0");
             }
+
+            $FTLVersion = exec("pihole-FTL version");
             ?>
+
         
             
     Donate if you found this useful.
    
     

From 901fc6392a4ddd4b99095edfc79aa9f00b3d104e Mon Sep 17 00:00:00 2001
From: Flo 
Date: Sun, 26 Mar 2017 14:46:57 +0200
Subject: [PATCH 091/132] Update help.php

---
 help.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/help.php b/help.php
index ccfda427..c1c0fd56 100644
--- a/help.php
+++ b/help.php
@@ -77,7 +77,7 @@
 
    
     
    
     
    Disable / Enable
    
-    Disables/enables Pi-Hole blocking completely. You may have to wait a few minutes for the changes to reach all of your devices. The change will be reflected by a changed status (top left)
+    Disables/enables Pi-hole blocking completely. You may have to wait a few minutes for the changes to reach all of your devices. The change will be reflected by a changed status (top left)
     
    
 
    
 
    
@@ -101,11 +101,11 @@
 
    
     
    
     
    Settings
    
-    Change settings for the Pi-Hole
+    Change settings for the Pi-hole
     
    Networking
    
-    Displays information about the interfaces of the Pi-Hole. No changes possible.
-    
    Pi-Hole DHCP Server
    
-    Using this setting you can enable/disable the DHCP server of the Pi-Hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled.
+    Displays information about the interfaces of the Pi-hole. No changes possible.
+    
    Pi-hole DHCP Server
    
+    Using this setting you can enable/disable the DHCP server of the Pi-hole. Note that you should disable any other DHCP server on your network to avoid IP addresses being used more than once. You have to give the range of IPs that DHCP will serve and the IP of the local router (gateway). If the DHCP server is active, the current leases are shown on the settings page. IPv4 DHCP will always be activated, IPv6 (stateless + statefull) can be enabled.
     
    Upstream DNS Servers
    
     Customize used upstream DNS servers + advanced settings for DNS servers. Note that any number of DNS servers may be enabled at a time.
     
    Query Logging
    

From f9151c1e9b07c60fe8e315bc4136ecab4da50b14 Mon Sep 17 00:00:00 2001
From: Flo 
Date: Sun, 26 Mar 2017 14:50:01 +0200
Subject: [PATCH 092/132] Update settings.php

---
 settings.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/settings.php b/settings.php
index a71ad9fd..29b0f91b 100644
--- a/settings.php
+++ b/settings.php
@@ -94,21 +94,21 @@
 			
    
 			
    
 				
    
-					
+					
 					
    
 						
    
 						
 					
    
 				
    
 				
    
-					
+					
 					
    
 						
    
 						
 					
    
 				
    
 				
    
-					
+					
 					
    
 						
    
 						
@@ -116,7 +116,7 @@
 					
    Warning: PHP has been compiled without IPv6 support.
    
 				
    
 				
    
-					
+					
 					
    
 						
    
 						
@@ -125,7 +125,7 @@
 			
    
 		
    
 
 		
    
 			
    
-				
    Pi-Hole DHCP Server
    
+				
    Pi-hole DHCP Server
    
 			
    
 			
    
 				
@@ -243,7 +243,7 @@
 								
    
 							
    
 							
    
-							
+							
 							
    
 								
    
 									
    Domain
    
@@ -562,7 +562,7 @@
 							
    
 								
    
 							
    
-							
    Note that enabling these two options may increase your privacy slightly, but may also prevent you from being able to access local hostnames if the Pi-Hole is not used as DHCP server
    
+							
    Note that enabling these two options may increase your privacy slightly, but may also prevent you from being able to access local hostnames if the Pi-hole is not used as DHCP server
    
 							
    
 								
    
 							
    

From 61870cf3426e6ca1bcea32b57e7c29d4f3070cb8 Mon Sep 17 00:00:00 2001
From: Flo 
Date: Sun, 26 Mar 2017 14:55:40 +0200
Subject: [PATCH 093/132] Update loginpage.php

---
 scripts/pi-hole/php/loginpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 393bf1db..560c934d 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -53,7 +53,7 @@
                 
    
               
    
               
    
-                After installing Pi-Hole for the first time, a password is generated and displayed to the user. The
+                After installing Pi-hole for the first time, a password is generated and displayed to the user. The
                 password cannot be retrieved later on, but it is possible to set a new password (or explicitly disable
                 the password by setting an empty password) using the command
                 
    sudo pihole -a -p newpassword
    

From 146184824fb75c1c8eaca19f3a5d5f41d24958e9 Mon Sep 17 00:00:00 2001
From: Flo 
Date: Sun, 26 Mar 2017 14:56:21 +0200
Subject: [PATCH 094/132] Update savesettings.php

---
 scripts/pi-hole/php/savesettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 13c60862..5c759c6d 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -400,7 +400,7 @@ function isinserverlist($addr) {
 
 			case "flushlogs":
 				exec("sudo pihole -f");
-				$success = "The Pi-Hole log file has been flushed";
+				$success = "The Pi-hole log file has been flushed";
 				break;
 
 			case "DHCP":

From 99e51ef2f0aa665eb937861a5ba3ffe030de3dfd Mon Sep 17 00:00:00 2001
From: Flo 
Date: Sun, 26 Mar 2017 17:04:44 +0200
Subject: [PATCH 095/132] Add the Pi-hole brand to the CONTRIBUTING.md

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 64e702f8..bfb67b77 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,3 +7,4 @@ This is a basic checklist for now, We will update it in the future.
 * Submit Pull Requests to the development branch only.
 * Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
 * Be patient. We will review all submitted pull requests, but our focus is on stability.. please don't be offended if we reject your PR, or it appears we're doing nothing with it! We'll get around to it..
+* Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)

From 77468ac541c891c5a52918ca856893c2370d4057 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Sun, 26 Mar 2017 22:19:41 +0200
Subject: [PATCH 096/132] Fix logic

---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 26370d5c..34701b7d 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -390,7 +390,7 @@ function updateSummaryData(runOnce) {
         }, 500);
 
     }).done(function() {
-        if(FTLoffline)
+        if(!FTLoffline)
         {
           setTimer(1);
         }

From 29c6c07af61e77b7bf72ca9dafa02113660c5e7f Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 28 Mar 2017 22:51:19 +0100
Subject: [PATCH 097/132] Add Query Types over Time

---
 api_FTL.php                 |  16 ++++
 index.php                   |   4 +-
 scripts/pi-hole/js/index.js | 175 +++++++++++++++++++++++-------------
 3 files changed, 130 insertions(+), 65 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index a4fcb766..0e0a2637 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -267,5 +267,21 @@ if (isset($_GET['getForwardDestinationNames']) && $auth)
 	$data = array_merge($data, $result);
 }
 
+if (isset($_GET['overTimeDataQueryTypes']) && $auth)
+{
+	sendRequestFTL("QueryTypesoverTime");
+	$return = getResponseFTL();
+
+	foreach($return as $line)
+	{
+		$tmp = explode(" ",$line);
+		for ($i=0; $i < count($tmp)-1; $i++) {
+			$over_time[intval($tmp[0])][$i] = intval($tmp[$i+1]);
+		}
+	}
+	$result = array('over_time' => $over_time);
+	$data = array_merge($data, $result);
+}
+
 disconnectFTL();
 ?>
diff --git a/index.php b/index.php
index a40f0576..bbe0a06b 100644
--- a/index.php
+++ b/index.php
@@ -68,7 +68,7 @@
     
    
     
    
         
    
-          
    Queries over time
    
+          
    Queries over Time
    
         
    
         
    
           
    
@@ -92,7 +92,7 @@
     
    
     
    
         
    
-          
    Query Types
    
+          
    Query Types over Time
    
         
    
         
    
           
    
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index d773aefc..fc408fb6 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -86,6 +86,66 @@ function updateQueriesOverTime() {
     });
 }
 
+function updateQueryTypesOverTime() {
+    $.getJSON("api.php?overTimeDataQueryTypes", function(data) {
+
+        if("FTLnotrunning" in data)
+        {
+            return;
+        }
+
+        // convert received objects to arrays
+        data.over_time = objectToArray(data.over_time);
+        var timestamps = data.over_time[0];
+        var plotdata  = data.over_time[1];
+        // Remove possibly already existing data
+        queryTypeChart.data.labels = [];
+        queryTypeChart.data.datasets[0].data = [];
+        queryTypeChart.data.datasets[1].data = [];
+
+        var colors = [];
+        $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
+        queryTypeChart.data.datasets[0].backgroundColor = colors[0];
+        queryTypeChart.data.datasets[1].backgroundColor = colors[1];
+
+            // Add data for each hour that is available
+        for (var j in timestamps) {
+            if ({}.hasOwnProperty.call(timestamps, j)) {
+                var d,h;
+                h = parseInt(timestamps[j]);
+                // New style: Get Unix timestamps
+                d = new Date(1000*h);
+
+                var sum = plotdata[j][0] + plotdata[j][1];
+                var A = 0, AAAA = 0;
+                if(sum > 0)
+                {
+                    A = plotdata[j][0]/sum;
+                    AAAA = plotdata[j][1]/sum;
+                }
+
+                queryTypeChart.data.labels.push(d);
+                queryTypeChart.data.datasets[0].data.push(A);
+                queryTypeChart.data.datasets[1].data.push(AAAA);
+            }
+        }
+        $("#query-types .overlay").hide();
+        queryTypeChart.update();
+    }).done(function() {
+        // Reload graph after 10 minutes
+        failures = 0;
+        setTimeout(updateQueryTypesOverTime, 600000);
+    }).fail(function() {
+        failures++;
+        if(failures < 5)
+        {
+            // Try again after 1 minute only if this has not failed more
+            // than five times in a row
+            setTimeout(updateQueryTypesOverTime, 60000);
+        }
+    });
+}
+
 function updateForwardedOverTime() {
     $.getJSON("api.php?overTimeDataForwards&getForwardDestinationNames", function(data) {
 
@@ -176,48 +236,6 @@ function updateForwardedOverTime() {
     });
 }
 
-function updateQueryTypes() {
-    $.getJSON("api.php?getQueryTypes", function(data) {
-
-        if("FTLnotrunning" in data)
-        {
-            return;
-        }
-
-        var colors = [];
-        // Get colors from AdminLTE
-        $.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
-        var v = [], c = [], k = [], iter;
-        // Collect values and colors, and labels
-        if(data.hasOwnProperty("querytypes"))
-        {
-            iter = data.querytypes;
-        }
-        else
-        {
-            iter = data;
-        }
-        $.each(iter, function(key , value) {
-            v.push(value);
-            c.push(colors.shift());
-            k.push(key);
-        });
-        // Build a single dataset with the data to be pushed
-        var dd = {data: v, backgroundColor: c};
-        // and push it at once
-        queryTypeChart.data.datasets[0] = dd;
-        queryTypeChart.data.labels = k;
-        $("#query-types .overlay").hide();
-        queryTypeChart.update();
-        queryTypeChart.chart.config.options.cutoutPercentage=50;
-        queryTypeChart.update();
-        // Don't use rotation animation for further updates
-        queryTypeChart.options.animation.duration=0;
-        // Update query types data every 10 seconds
-        setTimeout(updateQueryTypes, 10000);
-    });
-}
-
 // Credit: http://stackoverflow.com/questions/1787322/htmlspecialchars-equivalent-in-javascript/4835406#4835406
 function escapeHtml(text) {
   var map = {
@@ -545,7 +563,10 @@ $(document).ready(function() {
                         ticks: {
                             mix: 0.0,
                             max: 1.0,
-                            beginAtZero: true
+                            beginAtZero: true,
+                            callback: function(value, index, values) {
+                                return Math.round(value*100) + " %";
+                            }
                         },
                         stacked: true
                     }]
@@ -559,27 +580,55 @@ $(document).ready(function() {
         updateForwardedOverTime();
 
         // Create / load "Query Types" only if authorized
-        if(document.getElementById("queryTypeChart"))
-        {
-            ctx = document.getElementById("queryTypeChart").getContext("2d");
-            queryTypeChart = new Chart(ctx, {
-                type: "doughnut",
-                data: {
-                    labels: [],
-                    datasets: [{ data: [] }]
+        ctx = document.getElementById("queryTypeChart").getContext("2d");
+        queryTypeChart = new Chart(ctx, {
+            type: "line",
+            data: {
+                labels: [],
+                datasets: [
+                    {
+                        label: "A: IPv4 queries",
+                        pointRadius: 0,
+                        data: []
+                    },
+                    {
+                        label: "AAAA: IPv6 queries",
+                        pointRadius: 0,
+                        data: []
+                    }
+                ]
+            },
+            options: {
+                scales: {
+                    xAxes: [{
+                        type: "time",
+                        time: {
+                            unit: "hour",
+                            displayFormats: {
+                                hour: "HH:mm"
+                            },
+                            tooltipFormat: "HH:mm"
+                        }
+                    }],
+                    yAxes: [{
+                        ticks: {
+                            mix: 0.0,
+                            max: 1.0,
+                            beginAtZero: true,
+                            callback: function(value, index, values) {
+                                return Math.round(value*100) + " %";
+                            }
+                        },
+                        stacked: true
+                    }]
                 },
-                options: {
-                    legend: {
-                        display: false
-                    },
-                    animation: {
-                        duration: 2000
-                    },
-                    cutoutPercentage: 0
-                }
-            });
-            updateQueryTypes();
-        }
+                maintainAspectRatio: true
+            }
+        });
+
+        // Pull in data via AJAX
+
+        updateQueryTypesOverTime();
 
         // Create / load "Top Domains" and "Top Advertisers" only if authorized
         if(document.getElementById("domain-frequency")

From 00885265de7a38f313919a13c32bf143853e4b62 Mon Sep 17 00:00:00 2001
From: Adam Warner 
Date: Tue, 28 Mar 2017 19:35:12 +0100
Subject: [PATCH 098/132] Add a note about where the default whitelist entries
 come from, and what they mean.

---
 list.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/list.php b/list.php
index 9edbdbcb..25d74c4f 100644
--- a/list.php
+++ b/list.php
@@ -45,7 +45,11 @@ function getFullName() {
     
 
    
 
+    
 
 
 

From 6e5b55e5ac128deae43ee43b045c59416e7da7a8 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Wed, 29 Mar 2017 00:02:40 +0100
Subject: [PATCH 099/132] Only load data if context is available to prevent JS
 errors

---
 scripts/pi-hole/js/index.js | 175 ++++++++++++++++++------------------
 1 file changed, 90 insertions(+), 85 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index fc408fb6..5aab8bfb 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -388,7 +388,7 @@ function updateSummaryData(runOnce) {
                 $("#temperature").text(" ");
                 updateQueriesOverTime();
                 updateForwardedOverTime();
-                updateQueryTypes();
+                updateQueriesOverTime();
                 updateTopClientsChart();
                 updateTopLists();
             }
@@ -540,95 +540,100 @@ $(document).ready(function() {
 
         updateQueriesOverTime();
 
-        ctx = document.getElementById("forwardDestinationChart").getContext("2d");
-        forwardDestinationChart = new Chart(ctx, {
-            type: "line",
-            data: {
-                labels: [],
-                datasets: [{ data: [] }]
-            },
-            options: {
-                scales: {
-                    xAxes: [{
-                        type: "time",
-                        time: {
-                            unit: "hour",
-                            displayFormats: {
-                                hour: "HH:mm"
-                            },
-                            tooltipFormat: "HH:mm"
-                        }
-                    }],
-                    yAxes: [{
-                        ticks: {
-                            mix: 0.0,
-                            max: 1.0,
-                            beginAtZero: true,
-                            callback: function(value, index, values) {
-                                return Math.round(value*100) + " %";
-                            }
-                        },
-                        stacked: true
-                    }]
+        // Create / load "Forward Destinations over Time" only if authorized
+        if(document.getElementById("forwardDestinationChart"))
+        {
+            ctx = document.getElementById("forwardDestinationChart").getContext("2d");
+            forwardDestinationChart = new Chart(ctx, {
+                type: "line",
+                data: {
+                    labels: [],
+                    datasets: [{ data: [] }]
                 },
-                maintainAspectRatio: true
-            }
-        });
-
-        // Pull in data via AJAX
-
-        updateForwardedOverTime();
-
-        // Create / load "Query Types" only if authorized
-        ctx = document.getElementById("queryTypeChart").getContext("2d");
-        queryTypeChart = new Chart(ctx, {
-            type: "line",
-            data: {
-                labels: [],
-                datasets: [
-                    {
-                        label: "A: IPv4 queries",
-                        pointRadius: 0,
-                        data: []
+                options: {
+                    scales: {
+                        xAxes: [{
+                            type: "time",
+                            time: {
+                                unit: "hour",
+                                displayFormats: {
+                                    hour: "HH:mm"
+                                },
+                                tooltipFormat: "HH:mm"
+                            }
+                        }],
+                        yAxes: [{
+                            ticks: {
+                                mix: 0.0,
+                                max: 1.0,
+                                beginAtZero: true,
+                                callback: function(value, index, values) {
+                                    return Math.round(value*100) + " %";
+                                }
+                            },
+                            stacked: true
+                        }]
                     },
-                    {
-                        label: "AAAA: IPv6 queries",
-                        pointRadius: 0,
-                        data: []
-                    }
-                ]
-            },
-            options: {
-                scales: {
-                    xAxes: [{
-                        type: "time",
-                        time: {
-                            unit: "hour",
-                            displayFormats: {
-                                hour: "HH:mm"
-                            },
-                            tooltipFormat: "HH:mm"
-                        }
-                    }],
-                    yAxes: [{
-                        ticks: {
-                            mix: 0.0,
-                            max: 1.0,
-                            beginAtZero: true,
-                            callback: function(value, index, values) {
-                                return Math.round(value*100) + " %";
-                            }
+                    maintainAspectRatio: true
+                }
+            });
+
+            // Pull in data via AJAX
+            updateForwardedOverTime();
+        }
+
+        // Create / load "Query Types over Time" only if authorized
+        if(document.getElementById("queryTypeChart"))
+        {
+            ctx = document.getElementById("queryTypeChart").getContext("2d");
+            queryTypeChart = new Chart(ctx, {
+                type: "line",
+                data: {
+                    labels: [],
+                    datasets: [
+                        {
+                            label: "A: IPv4 queries",
+                            pointRadius: 0,
+                            data: []
                         },
-                        stacked: true
-                    }]
+                        {
+                            label: "AAAA: IPv6 queries",
+                            pointRadius: 0,
+                            data: []
+                        }
+                    ]
                 },
-                maintainAspectRatio: true
-            }
-        });
+                options: {
+                    scales: {
+                        xAxes: [{
+                            type: "time",
+                            time: {
+                                unit: "hour",
+                                displayFormats: {
+                                    hour: "HH:mm"
+                                },
+                                tooltipFormat: "HH:mm"
+                            }
+                        }],
+                        yAxes: [{
+                            ticks: {
+                                mix: 0.0,
+                                max: 1.0,
+                                beginAtZero: true,
+                                callback: function(value, index, values) {
+                                    return Math.round(value*100) + " %";
+                                }
+                            },
+                            stacked: true
+                        }]
+                    },
+                    maintainAspectRatio: true
+                }
+            });
 
-        // Pull in data via AJAX
-
-        updateQueryTypesOverTime();
+            // Pull in data via AJAX
+            updateQueryTypesOverTime();
+        }
 
         // Create / load "Top Domains" and "Top Advertisers" only if authorized
         if(document.getElementById("domain-frequency")

From e169f1086e8f56e020ecfddbbce8520927341d69 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Tue, 28 Mar 2017 22:11:06 +0200
Subject: [PATCH 100/132] Proposed change

---
 list.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/list.php b/list.php
index 25d74c4f..7f39c1e6 100644
--- a/list.php
+++ b/list.php
@@ -45,11 +45,8 @@ function getFullName() {
     
 
    
 
-    
+    
    Some of the domains shown below are domains of the adlists sources, which are automatically added in order to prevent adlists being able to blacklist each other. See here for the default set of adlists.
    
 
 
 

From c11172d7c4d600af06ef9a5246f7743f151868dc Mon Sep 17 00:00:00 2001
From: Adam Warner 
Date: Fri, 31 Mar 2017 21:05:53 +0100
Subject: [PATCH 101/132] modify to work with changes in pihole#1365

---
 scripts/pi-hole/php/savesettings.php | 36 ++++++++--------------------
 settings.php                         | 10 ++------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index c4d26253..9f902d5b 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -48,13 +48,12 @@ function validDomain($domain_name)
 			"8.20.247.20" => "Comodo"
 		];
 
-$adlistsdefault = [];
-$adlistsuser = [];
-function readAdlists($listname)
+$adlist = [];
+function readAdlists()
 {
 	// Reset list
 	$list = [];
-	$handle = @fopen("/etc/pihole/adlists.".$listname, "r");
+	$handle = @fopen("/etc/pihole/adlists.list", "r");
 	if ($handle)
 	{
 		while (($line = fgets($handle)) !== false)
@@ -76,8 +75,7 @@ function readAdlists($listname)
 }
 
 	// Read available adlists
-	$adlistsdefault = readAdlists("default");
-	$adlistsuser = readAdlists("user");
+	$adlist = readAdlists();
 
 	$error = "";
 	$success = "";
@@ -401,32 +399,18 @@ function readAdlists($listname)
 				break;
 
 			case "adlists":
-				foreach ($adlistsdefault as $key => $value)
+				foreach ($adlist as $key => $value)
 				{
 					if(isset($_POST["adlist-".$key]) && !$value[0])
 					{
 						// Is not enabled, but should be
-						exec("sudo pihole -a adlist enable default ".escapeshellcmd ($value[1]));
+						exec("sudo pihole -a adlist enable ".escapeshellcmd ($value[1]));
 
 					}
 					elseif(!isset($_POST["adlist-".$key]) && $value[0])
 					{
 						// Is enabled, but shouldn't be
-						exec("sudo pihole -a adlist disable default ".escapeshellcmd ($value[1]));
-					}
-				}
-				foreach ($adlistsuser as $key => $value)
-				{
-					if(isset($_POST["userlist-".$key]) && !$value[0])
-					{
-						// Is not enabled, but should be
-						exec("sudo pihole -a adlist enable user ".escapeshellcmd ($value[1]));
-
-					}
-					elseif(!isset($_POST["userlist-".$key]) && $value[0])
-					{
-						// Is enabled, but shouldn't be
-						exec("sudo pihole -a adlist disable user ".escapeshellcmd ($value[1]));
+						exec("sudo pihole -a adlist disable ".escapeshellcmd ($value[1]));
 					}
 				}
 
@@ -435,13 +419,13 @@ function readAdlists($listname)
 					$domains = array_filter(preg_split('/\r\n|[\r\n]/', $_POST["newuserlists"]));
 					foreach($domains as $domain)
 					{
-						exec("sudo pihole -a adlist add user ".escapeshellcmd($domain));
+						exec("sudo pihole -a adlist add ".escapeshellcmd($domain));
 					}
 				}
 
 				// Reread available adlists
-				$adlistsdefault = readAdlists("default");
-				$adlistsuser = readAdlists("user");
+				$adlist = readAdlists();
+
 				break;
 
 			default:
diff --git a/settings.php b/settings.php
index fd68e495..fd99bfda 100644
--- a/settings.php
+++ b/settings.php
@@ -655,18 +655,12 @@ if(isset($_POST["submit"])) {
 			
    
 				
    
 				
-					 $value) { ?>
+					 $value) { ?>
 					
    
 						
    
 					
    
 					
-				
-					 $value) { ?>
-					
    
-						
    
-					
    
-					
-					
    
+				    
    
 						
 					
    
 				
    

From 42f4c51f084b83c005f4302f527ef538180d0e5e Mon Sep 17 00:00:00 2001
From: Adam Warner 
Date: Fri, 31 Mar 2017 21:07:31 +0100
Subject: [PATCH 102/132] move to a more prominent location

---
 settings.php | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/settings.php b/settings.php
index fd99bfda..375ff0fc 100644
--- a/settings.php
+++ b/settings.php
@@ -526,7 +526,33 @@ if(isset($_POST["submit"])) {
 	}
 
 ?>
-		
    
+        
    
+            
    
+                
    Pi-Hole's Block Lists
    
+                
    
+            
    
+            
+                
    
+                    
    
+                        
+                         $value) { ?>
+                            
    
+                                
    
+                            
    
+                        
+                        
    
+                            
+                        
    
+                    
    
+                
    
+                
    
+                    
+                    
+                    
+                
    
+            
+        
    
+        
    
 			
    
 				
    API
    
 			
    
@@ -646,32 +672,6 @@ if(isset($_POST["submit"])) {
 			
    
 		
    
 */ ?>
-		
    
-			
    
-				
    Pi-Hole's Block Lists
    
-				
    
-			
    
-			
    
-			
    
-				
    
-				
-					 $value) { ?>
-					
    
-						
    
-					
    
-					
-				    
    
-						
-					
    
-				
    
-			
    
-			
    
-				
-				
-				
-			
    
-			
    
-		
    
 		
    
 			
    
 				
    System Administration
    

From 1f6c95a2c0d1e4f7f12982f0f88ed3de27bb4d8f Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 31 Mar 2017 18:23:39 -0400
Subject: [PATCH 103/132] Lists are no longer reset on updates

---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 375ff0fc..53f7f622 100644
--- a/settings.php
+++ b/settings.php
@@ -534,7 +534,7 @@ if(isset($_POST["submit"])) {
             
    
                 
    
                     
    
-                        
+                        
                          $value) { ?>
                             
    
                                 
    

From 87b92d425cbe3a86448c60785c5069a4e1ab74b9 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 31 Mar 2017 18:33:10 -0400
Subject: [PATCH 104/132] Add delete checkbox

---
 settings.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 53f7f622..da8ac8e3 100644
--- a/settings.php
+++ b/settings.php
@@ -537,7 +537,15 @@ if(isset($_POST["submit"])) {
                         
                          $value) { ?>
                             
    
-                                
    
+                                
    
+                                    
+                                
    
                             
    
                         
                         
    

From 86d886986760d802e063fd1c5b07f85113c0016d Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 31 Mar 2017 18:42:00 -0400
Subject: [PATCH 105/132] Handle deletion of list in savesettings.php

---
 scripts/pi-hole/php/savesettings.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 9f902d5b..7f4fc8c7 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -401,16 +401,21 @@ function readAdlists()
 			case "adlists":
 				foreach ($adlist as $key => $value)
 				{
-					if(isset($_POST["adlist-".$key]) && !$value[0])
+					if(isset($_POST["adlist-del-".$key]))
+					{
+						// Delete list
+						exec("sudo pihole -a adlist del ".escapeshellcmd($value[1]));
+					}
+					elseif(isset($_POST["adlist-".$key]) && !$value[0])
 					{
 						// Is not enabled, but should be
-						exec("sudo pihole -a adlist enable ".escapeshellcmd ($value[1]));
+						exec("sudo pihole -a adlist enable ".escapeshellcmd($value[1]));
 
 					}
 					elseif(!isset($_POST["adlist-".$key]) && $value[0])
 					{
 						// Is enabled, but shouldn't be
-						exec("sudo pihole -a adlist disable ".escapeshellcmd ($value[1]));
+						exec("sudo pihole -a adlist disable ".escapeshellcmd($value[1]));
 					}
 				}
 

From 7a5c8e899e1bd266b0eea67887285499c755d303 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 31 Mar 2017 20:16:58 -0400
Subject: [PATCH 106/132] Use button to remove lists

---
 scripts/pi-hole/js/settings.js       | 11 +++++++++++
 scripts/pi-hole/php/savesettings.php |  4 ++--
 settings.php                         |  8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index e7e613ea..0e5f3146 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -87,3 +87,14 @@ $(document).ready(function(){
     $("[data-toggle=\"tooltip\"]").tooltip({"html": true, container : "body"});
 });
 
+// Handle list deletion
+$("button[id^='adlist-btn-']").on("click", function (e) {
+	e.preventDefault();
+
+	var status = $(this).siblings("input[name^='adlist-del-']").is(":checked");
+	var text_type = status ? "none" : "line-through";
+
+    $(this).siblings("input[name^='adlist-del-']").prop("checked", !status);
+    $(this).siblings("input[name^='adlist-enable-']").prop("disabled", !status);
+	$(this).siblings("a").css("text-decoration", text_type);
+});
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 7f4fc8c7..08cbbcc2 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -406,13 +406,13 @@ function readAdlists()
 						// Delete list
 						exec("sudo pihole -a adlist del ".escapeshellcmd($value[1]));
 					}
-					elseif(isset($_POST["adlist-".$key]) && !$value[0])
+					elseif(isset($_POST["adlist-enable-".$key]) && !$value[0])
 					{
 						// Is not enabled, but should be
 						exec("sudo pihole -a adlist enable ".escapeshellcmd($value[1]));
 
 					}
-					elseif(!isset($_POST["adlist-".$key]) && $value[0])
+					elseif(!isset($_POST["adlist-enable-".$key]) && $value[0])
 					{
 						// Is enabled, but shouldn't be
 						exec("sudo pihole -a adlist disable ".escapeshellcmd($value[1]));
diff --git a/settings.php b/settings.php
index da8ac8e3..161957ac 100644
--- a/settings.php
+++ b/settings.php
@@ -539,11 +539,13 @@ if(isset($_POST["submit"])) {
                             
    
                                 
    
                                     
                                 
    
                             
    

From db54cdafe73741549ee45584c03ec508470840d6 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Fri, 31 Mar 2017 20:19:09 -0400
Subject: [PATCH 107/132] Change wording of block list label

---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 161957ac..95c98904 100644
--- a/settings.php
+++ b/settings.php
@@ -534,7 +534,7 @@ if(isset($_POST["submit"])) {
             
                 
    
                     
    
-                        
+                        
                          $value) { ?>
                             
    
                                 
    

From d956c35c24902be2909315417b9198521277a537 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Sun, 2 Apr 2017 19:20:05 -0400
Subject: [PATCH 108/132] Expose a CSRF token when logged in

---
 scripts/pi-hole/php/header.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index cb56f1e5..40bc494a 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -12,6 +12,12 @@
 
     check_cors();
 
+    // Generate CSRF token
+    if(empty($_SESSION['token'])) {
+        $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32));
+    }
+    $token = $_SESSION['token'];
+
     // Try to get temperature value from different places (OS dependent)
     if(file_exists("/sys/class/thermal/thermal_zone0/temp"))
     {
@@ -196,6 +202,11 @@
         
    To enable Javascript click here
    
 
    
 
+$token
    ";
+}
+?>
 
 
 

From 4d9d9dc949be177099c0e6a9eebf83c24f78bb93 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Sun, 2 Apr 2017 19:23:03 -0400
Subject: [PATCH 109/132] Require CSRF token for debug log generation

---
 scripts/pi-hole/js/debug.js   |  7 ++++---
 scripts/pi-hole/php/debug.php | 12 ++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/debug.js b/scripts/pi-hole/js/debug.js
index c0db2ce0..0a6b3ab1 100644
--- a/scripts/pi-hole/js/debug.js
+++ b/scripts/pi-hole/js/debug.js
@@ -29,20 +29,21 @@ function eventsource() {
     var ta = $("#output");
     var upload = $( "#upload" );
     var checked = "";
+    var token = encodeURIComponent($("#token").html());
 
     if(upload.prop("checked"))
     {
-      checked = "upload";
+        checked = "upload";
     }
 
     // IE does not support EventSource - load whole content at once
     if (typeof EventSource !== "function") {
-        httpGet(ta,"/admin/scripts/pi-hole/php/debug.php?IE&"+checked);
+        httpGet(ta,"/admin/scripts/pi-hole/php/debug.php?IE&token="+token+"&"+checked);
         return;
     }
 
     var host = window.location.host;
-    var source = new EventSource("/admin/scripts/pi-hole/php/debug.php?"+checked);
+    var source = new EventSource("/admin/scripts/pi-hole/php/debug.php?&token="+token+"&"+checked);
 
     // Reset and show field
     ta.empty();
diff --git a/scripts/pi-hole/php/debug.php b/scripts/pi-hole/php/debug.php
index 93ae3166..39d5c8ea 100644
--- a/scripts/pi-hole/php/debug.php
+++ b/scripts/pi-hole/php/debug.php
@@ -5,6 +5,18 @@ ob_implicit_flush(true);
 header('Content-Type: text/event-stream');
 header('Cache-Control: no-cache');
 
+require "password.php";
+require "auth.php";
+
+if(!$auth) {
+    die("Unauthorized");
+}
+
+check_cors();
+
+$token = isset($_GET["token"]) ? $_GET["token"] : "";
+check_csrf($token);
+
 function echoEvent($datatext) {
     if(!isset($_GET["IE"]))
       echo "data: ".implode("\ndata: ", explode("\n", $datatext))."\n\n";

From fe7f3d3873aa89c3fa698070147ff2ff03de63cd Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Sun, 2 Apr 2017 20:04:39 -0400
Subject: [PATCH 110/132] Require CSRF token when changing settings

---
 scripts/pi-hole/php/savesettings.php | 3 +++
 settings.php                         | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 5c759c6d..e78411e1 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -130,6 +130,9 @@ function isinserverlist($addr) {
 
 	if(isset($_POST["field"]))
 	{
+		// Handle CSRF
+		check_csrf(isset($_POST["token"]) ? $_POST["token"] : "");
+
 		// Process request
 		switch ($_POST["field"]) {
 			// Set DNS server
diff --git a/settings.php b/settings.php
index 29b0f91b..f7130b8a 100644
--- a/settings.php
+++ b/settings.php
@@ -392,6 +392,7 @@
 			
    
 			
    
 				
+				
 				
 			
    
 			
@@ -588,6 +589,7 @@
 			
    
 			
    
 				
+				
 				
 			
    
 			
@@ -629,6 +631,7 @@
 				
    
 				
 				
+				
 				
 					
 					
@@ -713,6 +716,7 @@
 			
    
 			
    
 				
+				
 				
 				
 			
    
@@ -764,6 +768,7 @@
 			
    
 			
    
 				
+				
 				
 			
    
 			
@@ -795,12 +800,15 @@
 
 				
    
 					
+					
 				
    
 				
    
 					
+					
 				
    
 				
    
 					
+					
 				
    
 			
    
 		
    
@@ -863,6 +871,7 @@ if($FTL)
 							
 							
 							
    Upload only Pi-hole backup files.
    
+							
 							
 						
    
 					
    

From 7e68fdecff1949fd3fed2f2d76b8dfdd9a09af31 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Mon, 3 Apr 2017 10:17:05 +0200
Subject: [PATCH 111/132] Make sure license comment is only outputted after
 header.php has prepared all the stuff that need to be done beforehand. Fixes
 #450

---
 debug.php                      | 8 +++++++-
 gravity.php                    | 6 +++---
 help.php                       | 6 +++---
 index.php                      | 6 +++---
 list.php                       | 8 ++++----
 queries.php                    | 6 +++---
 queryads.php                   | 6 +++---
 scripts/pi-hole/php/header.php | 7 ++++++-
 settings.php                   | 6 +++---
 taillog-FTL.php                | 6 +++---
 taillog.php                    | 6 +++---
 11 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/debug.php b/debug.php
index 84416cff..20ffa7c8 100644
--- a/debug.php
+++ b/debug.php
@@ -1,4 +1,10 @@
-
 
diff --git a/gravity.php b/gravity.php
index 15f6e605..5e736725 100644
--- a/gravity.php
+++ b/gravity.php
@@ -1,10 +1,10 @@
-
-
 
diff --git a/help.php b/help.php
index c1c0fd56..cc0b66de 100644
--- a/help.php
+++ b/help.php
@@ -1,10 +1,10 @@
-
- 0)
diff --git a/index.php b/index.php
index bbe0a06b..9355347b 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
-
-
diff --git a/list.php b/list.php
index 7f39c1e6..81cce46e 100644
--- a/list.php
+++ b/list.php
@@ -1,11 +1,11 @@
-
-
-
-
 
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index cb56f1e5..a6a1c79d 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -148,8 +148,13 @@
     }
 
 ?>
-
 
+
 
 
     
diff --git a/settings.php b/settings.php
index 29b0f91b..080982d4 100644
--- a/settings.php
+++ b/settings.php
@@ -1,10 +1,10 @@
-
-
-
 
diff --git a/taillog.php b/taillog.php
index c2b1e5a9..126648d2 100644
--- a/taillog.php
+++ b/taillog.php
@@ -1,10 +1,10 @@
-
-
 

From 1e748446df43cd086124a19fbfbd4bba060f9706 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Tue, 4 Apr 2017 21:02:48 -0400
Subject: [PATCH 112/132] Require CSRF token for Teleporter

---
 scripts/pi-hole/php/teleporter.php | 4 +++-
 settings.php                       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index 43092806..0965d109 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -7,11 +7,13 @@
 *  Please see LICENSE file for your rights under this license. */
 
 require "password.php";
+require "auth.php"; // Also imports func.php
+
 if (php_sapi_name() !== "cli") {
 	if(!$auth) die("Not authorized");
+	check_csrf(isset($_POST["token"]) ? $_POST["token"] : "");
 }
 
-require('func.php');
 function process_zip($name)
 {
 	global $zip;
diff --git a/settings.php b/settings.php
index 23b15644..41d1eef2 100644
--- a/settings.php
+++ b/settings.php
@@ -1,4 +1,4 @@
-
 			
 				
    
+					
 					
    
 						
    Export your Pi-hole lists as downloadable ZIP file
    
 						
@@ -871,7 +872,6 @@ if($FTL)
 							
 							
 							
    Upload only Pi-hole backup files.
    
-							
 							
 						
    
 					
    

From 3d0a3506d44173179c69cbb80d552190d66e093b Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Tue, 4 Apr 2017 21:03:23 -0400
Subject: [PATCH 113/132] Small HTML compatibility change:  to 

---
 settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.php b/settings.php
index 41d1eef2..d8ae81c1 100644
--- a/settings.php
+++ b/settings.php
@@ -877,7 +877,7 @@ if($FTL)
 					
    
 				
 			
-				
    The PHP extension zip is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.
    
+				
    The PHP extension zip is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.
    
 			
 			
    
 		
    

From cd4b25ceec52b0c79520923f72a512d643901f8a Mon Sep 17 00:00:00 2001
From: Patrick O'Brien 
Date: Wed, 5 Apr 2017 12:40:35 -0400
Subject: [PATCH 114/132] update change password examples

---
 help.php                          | 4 ++--
 scripts/pi-hole/php/loginpage.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/help.php b/help.php
index cc0b66de..102c6e72 100644
--- a/help.php
+++ b/help.php
@@ -1,4 +1,4 @@
-
     
    
     
    Authentication system (currently enableddisabled)
    
-    
    Using the command
    sudo pihole -a -p pa22w0rd
     where pa22w0rd is the password to be set in this example, one can enable the authentication system of this web interface. Thereafter, a login is required for most pages (the dashboard will show a limited amount of statistics). Note that the authentication system may be disabled again, by setting an empty password using the command shown above. The Help center will show more details concerning the authentication system only if it is enabled
    
+    
    Using the command
    sudo pihole -a -p
     and entering a password to be set, one can enable the authentication system of this web interface. Thereafter, a login is required for most pages (the dashboard will show a limited amount of statistics). Note that the authentication system may be disabled again, by setting an empty password using the command shown above. The Help center will show more details concerning the authentication system only if it is enabled
    
     
    
 
    
 
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 560c934d..8a88f50c 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -56,7 +56,7 @@
                 After installing Pi-hole for the first time, a password is generated and displayed to the user. The
                 password cannot be retrieved later on, but it is possible to set a new password (or explicitly disable
                 the password by setting an empty password) using the command
-                
    sudo pihole -a -p newpassword
    
+                
    sudo pihole -a -p
    
               
    
             
    
           
    

From 892bc5f1c5c773c7948a414449d8b726418b3451 Mon Sep 17 00:00:00 2001
From: Adam Warner 
Date: Thu, 6 Apr 2017 18:45:26 +0100
Subject: [PATCH 115/132] :codacy:

---
 scripts/pi-hole/js/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 0e5f3146..b614bdee 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -92,9 +92,9 @@ $("button[id^='adlist-btn-']").on("click", function (e) {
 	e.preventDefault();
 
 	var status = $(this).siblings("input[name^='adlist-del-']").is(":checked");
-	var text_type = status ? "none" : "line-through";
+	var textType = status ? "none" : "line-through";
 
     $(this).siblings("input[name^='adlist-del-']").prop("checked", !status);
     $(this).siblings("input[name^='adlist-enable-']").prop("disabled", !status);
-	$(this).siblings("a").css("text-decoration", text_type);
+	$(this).siblings("a").css("text-decoration", textType);
 });

From f87a94de33225e23ad7d49c27a9088bb5e5c6a72 Mon Sep 17 00:00:00 2001
From: Mcat12 
Date: Wed, 12 Apr 2017 21:22:49 -0400
Subject: [PATCH 116/132] Add CSRF token to ad list section

---
 settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.php b/settings.php
index d74069b4..a8e38c08 100644
--- a/settings.php
+++ b/settings.php
@@ -715,6 +715,7 @@ if(isset($_POST["submit"])) {
                 
    
                 
    
                     
+                    
                     
                     
                 
    

From b3cbd29ed7b6dcaf08e77ba2e42346889ab7a7c2 Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Thu, 20 Apr 2017 13:20:36 +0200
Subject: [PATCH 117/132] Don't rely on PID file, but try to detect FTL PID
 ourselves (has shown to be very effective in the update service file)

---
 scripts/pi-hole/php/FTL.php    | 3 ++-
 scripts/pi-hole/php/header.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index c483ecba..c80f20b6 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -8,7 +8,8 @@
 
 function testFTL()
 {
-	return (strpos(exec("ps -p `cat /var/run/pihole-FTL.pid` -o comm="), "pihole-FTL") !== false);
+	$ret = shell_exec("pidof pihole-FTL");
+	return intval($ret);
 }
 
 function connectFTL($address, $port=4711, $quiet=true)
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index a858c328..0c49b724 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -146,12 +146,12 @@
         }
     }
 
-    $FTL = false;
-    $FTLpid = file_get_contents("/var/run/pihole-FTL.pid");
-    if (file_exists( "/proc/".$FTLpid ))
+    function pidofFTL()
     {
-        $FTL = true;
+        return shell_exec("pidof pihole-FTL");
     }
+    $FTLpid = intval(pidofFTL());
+    $FTL = ($FTLpid !== 0 ? true : false);
 
 ?>
 

From 3e88e725570dd25aced585eda9bcb274c3aedaee Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Thu, 20 Apr 2017 13:24:52 +0200
Subject: [PATCH 118/132] Bugfix: updateQueriesOverTime() has been called
 twice, but updateQueryTypesOverTime() hasn't been called at all

---
 scripts/pi-hole/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index 5aab8bfb..ade3c365 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -388,7 +388,7 @@ function updateSummaryData(runOnce) {
                 $("#temperature").text(" ");
                 updateQueriesOverTime();
                 updateForwardedOverTime();
-                updateQueriesOverTime();
+                updateQueryTypesOverTime();
                 updateTopClientsChart();
                 updateTopLists();
             }

From 4d7eef2d55ac1f1d4648c1f5982e8eb0fa91099b Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Thu, 20 Apr 2017 13:40:23 +0200
Subject: [PATCH 119/132] Improve behavior if socket connection does not work
 because, e.g. pihole-FTL is not listening: don't wait until socket timeout,
 but define our own timeout of 3 seconds

---
 scripts/pi-hole/php/FTL.php | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
index c80f20b6..4b20e528 100644
--- a/scripts/pi-hole/php/FTL.php
+++ b/scripts/pi-hole/php/FTL.php
@@ -14,6 +14,8 @@ function testFTL()
 
 function connectFTL($address, $port=4711, $quiet=true)
 {
+	$timeout = 3;
+
 	if(!$quiet)
 	{
 		echo "Attempting to connect to '$address' on port '$port'...\n";
@@ -31,12 +33,31 @@ function connectFTL($address, $port=4711, $quiet=true)
 	$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)
 	or die("socket_create() failed: reason: " . socket_strerror(socket_last_error()) . "\n");
 
-	$result = socket_connect($socket, $address, $port)
-	or die("socket_connect() failed.\nReason: ($result) " . socket_strerror(socket_last_error($socket)) . "\n");
+	socket_set_nonblock($socket) or die("Unable to set nonblock on socket\n");
 
-	// Set timeout to 10 seconds
-	socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec'=>10, 'usec'=>0]);
-	socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec'=>10, 'usec'=>0]);
+	$time = time();
+	while (!@socket_connect($socket, $address, $port))
+	{
+		$err = socket_last_error($socket);
+		if ($err == 115 || $err == 114)
+		{
+			if ((time() - $time) >= $timeout)
+			{
+				socket_close($socket);
+				die("Connection timed out.\n");
+			}
+			// Wait for 1 millisecond
+			usleep(1000);
+			continue;
+		}
+		die(socket_strerror($err) . "\n");
+	}
+
+	socket_set_block($socket) or die("Unable to set block on socket\n");
+
+	// Set timeout to 3 seconds
+	socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec'=>$timeout, 'usec'=>0]);
+	socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec'=>$timeout, 'usec'=>0]);
 
 	if(!$quiet)
 	{

From bc3ff69b3fef6e5b25e7c3be052b89933bd21eff Mon Sep 17 00:00:00 2001
From: DL6ER 
Date: Fri, 21 Apr 2017 15:48:47 +0200
Subject: [PATCH 120/132] Hide "Query Types over Time" and "Forward
 Destinations over Time" graphs on too small screens

---
 index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 9355347b..43d58de8 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-
 
    
-    
    
+