From 08ea1f9def4756ea910227b32d7f052b333ff768 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 26 Mar 2022 10:04:50 +0000
Subject: [PATCH 1/4] Bump prettier from 2.6.0 to 2.6.1

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.6.0...2.6.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d804874..b0b6076a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2825,9 +2825,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz",
-      "integrity": "sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz",
+      "integrity": "sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==",
       "dev": true
     },
     "prettier-linter-helpers": {
diff --git a/package.json b/package.json
index 6bba05e2..2b0a2e27 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "eslint-plugin-compat": "^4.0.2",
     "postcss": "^8.4.12",
     "postcss-cli": "^9.1.0",
-    "prettier": "2.6.0",
+    "prettier": "2.6.1",
     "xo": "^0.48.0"
   },
   "browserslist": [

From 1d9b40d245e4b1bdb0b2c66f5a8ad855b1d6a0c7 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Sun, 27 Mar 2022 23:16:52 -0300
Subject: [PATCH 2/4] Replace old image button with a simple button

- add fixes for mobile and medium screens
- new style selectors
- button background-color (tablets / medium screens)
- small adjustments
- remove unused image file

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 img/donate.gif                 | Bin 3592 -> 0 bytes
 scripts/pi-hole/php/header.php |   6 +++---
 style/pi-hole.css              |  27 +++++++++++++++++++++++++++
 style/themes/default-dark.css  |   2 +-
 style/themes/lcars.css         |   4 ++++
 5 files changed, 35 insertions(+), 4 deletions(-)
 delete mode 100644 img/donate.gif

diff --git a/img/donate.gif b/img/donate.gif
deleted file mode 100644
index 4700ced8c066bb1c4f057c4d4c6432d3c8c45c42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3592
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

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index b4637806..e7703a7a 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -313,10 +313,10 @@ if($auth) {
                             </li>
                             <!-- Menu Footer -->
                             <li class="user-footer">
-                                <!-- PayPal -->
+                                <!-- Donate Button -->
                                 <div class="text-center">
-                                    <a href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
-                                        <img src="img/donate.gif" alt="Donate" width="147" height="47">
+                                    <a class="btn btn-primary btn-lg donate" href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
+                                        <i class="fas fa-fw menu-icon fa-donate"></i> Donate
                                     </a>
                                 </div>
                             </li>
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 2388325b..8dba0c14 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -667,6 +667,33 @@ td.details-control {
   height: 50px;
 }
 
+.navbar-nav > .user-menu > .dropdown-menu > .user-body a {
+  background: transparent !important;
+}
+
+/*** Donate button - navbar ***/
+.main-header .navbar-custom-menu .user-footer .donate {
+  margin: 15px;
+  padding: 0.8em 1em;
+  width: calc(100% - 30px);
+  color: #fff;
+  background: #96060c;
+  border: none;
+  border-radius: 6px;
+}
+
+.main-header .navbar-custom-menu .user-footer .donate:hover,
+.main-header .navbar-custom-menu .user-footer .donate:active,
+.main-header .navbar-custom-menu .user-footer .donate:active:hover,
+.main-header .navbar-custom-menu .user-footer .donate:focus,
+.main-header .navbar-custom-menu .user-footer .donate:active:focus {
+  background: #f60d1a;
+}
+
+.navbar-custom-menu > .navbar-nav > li:nth-child(2) {
+  padding: 0 5px;
+}
+
 #apiTokenIframe {
   width: 100%;
   border: 0;
diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css
index a95ab53c..68100a88 100644
--- a/style/themes/default-dark.css
+++ b/style/themes/default-dark.css
@@ -503,7 +503,7 @@ fieldset[disabled] .form-control {
   background-color: #353c42;
   opacity: 1;
 }
-.dropdown-menu {
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
   background-color: #4c5761;
   color: #bec5cb;
   border: 1px solid #171c20;
diff --git a/style/themes/lcars.css b/style/themes/lcars.css
index 103a1fac..139e6699 100644
--- a/style/themes/lcars.css
+++ b/style/themes/lcars.css
@@ -505,6 +505,10 @@ p.login-box-msg,
   box-shadow: 0 0 0 100vmax rgba(0, 0, 0, 0.6);
 }
 
+.dropdown-toggle {
+  z-index: 2000;
+}
+
 .dropdown-menu > li > a {
   color: inherit;
 }

From d9869bf2c99e1b581f676b32b13e47221cbfb427 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Wed, 30 Mar 2022 21:24:53 -0300
Subject: [PATCH 3/4] Add `export` to avoid docker error message

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/php/debug.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/debug.php b/scripts/pi-hole/php/debug.php
index d7ef02bf..60286b9b 100644
--- a/scripts/pi-hole/php/debug.php
+++ b/scripts/pi-hole/php/debug.php
@@ -50,9 +50,9 @@ function echoEvent($datatext) {
 }
 
 if (isset($_GET["upload"])) {
-    $proc = popen("sudo pihole -d -a -w", "r");
+    $proc = popen("export TERM=dumb && sudo pihole -d -a -w", "r");
 } else {
-    $proc = popen("sudo pihole -d -w", "r");
+    $proc = popen("export TERM=dumb && sudo pihole -d -w", "r");
 }
 
 while (!feof($proc)) {

From 933e5512ddcae69133bb96e46f7d10d759ccb44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Mon, 4 Apr 2022 13:39:16 +0200
Subject: [PATCH 4/4] Convert IDNs to punycode before searching the lists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/php/queryads.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/queryads.php b/scripts/pi-hole/php/queryads.php
index 535dc146..9818f269 100644
--- a/scripts/pi-hole/php/queryads.php
+++ b/scripts/pi-hole/php/queryads.php
@@ -26,10 +26,10 @@ function echoEvent($datatext) {
 if(isset($_GET["domain"]))
 {
     // Is this a valid domain?
-    $url = $_GET["domain"];
+    $url = idn_to_ascii($_GET["domain"]);
     if(!validDomain($url))
     {
-        echoEvent("Invalid domain!");
+        echoEvent("$url is an invalid domain!");
         die();
     }
 }