From b65544639dcc7ca346c1e6f48b5f203d106f2850 Mon Sep 17 00:00:00 2001 From: Antony Bailey Date: Wed, 15 Feb 2017 21:15:15 +0000 Subject: [PATCH 01/17] Set Github logo in footer to be link to Github Org --- scripts/pi-hole/php/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index 8f60954d..611f9797 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -29,7 +29,7 @@ Pi-hole Version Web Interface Version -
Donate if you found this useful.
+
Donate if you found this useful.
From 3c90f544b97b8c9a8ed4b9acd6936dee28e22d41 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 16 Feb 2017 11:43:09 +0100 Subject: [PATCH 02/17] Fix timezone display in Query Log display --- scripts/pi-hole/php/data.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/pi-hole/php/data.php b/scripts/pi-hole/php/data.php index 92eee58e..30dfe416 100644 --- a/scripts/pi-hole/php/data.php +++ b/scripts/pi-hole/php/data.php @@ -453,20 +453,20 @@ } if($orderBy == "orderByClientDomainTime"){ - $allQueries['data'][hasHostName($client)][$domain][$time->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), From 5076de084b40e9fc31fb198932d867038993605c Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 17 Feb 2017 20:46:43 +0000 Subject: [PATCH 03/17] javascript --- scripts/pi-hole/js/footer.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 6dd4ce65..4b56b292 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -85,6 +85,13 @@ $("#pihole-disable-5m").on("click", function(e){ piholeChange("disable","300"); setTimeout(function(){piholeChanged("enabled");},300000); }); +$("#pihole-disable-custom").on("click", function(e){ + e.preventDefault(); + var custVal = $('#customTimeout').val(); + custVal = $('#btnMins').hasClass("active") ? custVal * 60 : custVal; + piholeChange("disable",custVal); + setTimeout(function(){piholeChanged("enabled");},300000); +}); var piholeVersion = $("#piholeVersion").html(); var webVersion = $("#webVersion").html(); From 0e9976902b64db99cb4928dfc557d7d59425e873 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 17 Feb 2017 20:47:28 +0000 Subject: [PATCH 04/17] new button --- scripts/pi-hole/php/header.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 91a56f7d..1ca3fe52 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -398,6 +398,11 @@ For 5 minutes +
  • + + Custom time + +
    • From 7e986ff008dbfa70e44cd25d23568cca6a6f6ee1 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 17 Feb 2017 20:48:39 +0000 Subject: [PATCH 05/17] modal dialog --- index.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/index.php b/index.php index 0651a645..62721753 100644 --- a/index.php +++ b/index.php @@ -2,6 +2,39 @@ $indexpage = true; require "scripts/pi-hole/php/header.php"; ?> + + + + +
    From ff5cf63aaf7d8f72bdd747746ecda6b5b5bc297e Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 17 Feb 2017 21:01:54 +0000 Subject: [PATCH 06/17] Move modal dialog to footer.php so it works from anywhere --- index.php | 32 -------------------------------- scripts/pi-hole/php/footer.php | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/index.php b/index.php index 62721753..98450d88 100644 --- a/index.php +++ b/index.php @@ -3,38 +3,6 @@ require "scripts/pi-hole/php/header.php"; ?> - - - -
    diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php index 611f9797..0bfd2d08 100644 --- a/scripts/pi-hole/php/footer.php +++ b/scripts/pi-hole/php/footer.php @@ -1,6 +1,37 @@
    + + +