Merge branch 'devel' into sidebar_warnings

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": {

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": [

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)) {

scripts/pi-hole/php/header.php

@@ -308,10 +308,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>

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();
     }
 }

style/pi-hole.css

@@ -708,6 +708,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;

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;

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;
 }