Merge branch 'devel' into update/dnsmasq-v2.86

scripts/pi-hole/js/settings.js

@@ -121,8 +121,7 @@ $(".confirm-disablelogging-noflush").confirm({
 });
 
 $(".api-token").confirm({
-  text:
-    "Make sure that nobody else can scan this code around you. They will have full access to the API without having to know the password. Note that the generation of the QR code will take some time.",
+  text: "Make sure that nobody else can scan this code around you. They will have full access to the API without having to know the password. Note that the generation of the QR code will take some time.",
   title: "Confirmation required",
   confirm: function () {
     window.open("scripts/pi-hole/php/api_token.php");

scripts/pi-hole/php/auth.php

@@ -47,7 +47,12 @@ function check_cors() {
     $virtual_host = getenv('VIRTUAL_HOST');
     if (! empty($virtual_host))
         array_push($AUTHORIZED_HOSTNAMES, $virtual_host);
-
+    
+    # Allow user set CORS
+    $cors_hosts = getenv('CORS_HOSTS');
+    if (! empty($cors_hosts))
+        array_push($AUTHORIZED_HOSTNAMES, ...explode(",", $cors_hosts));
+    
     // Since the Host header is easily manipulated, we can only check if it's wrong and can't use it
     // to validate that the client is authorized, only unauthorized.
     $server_host = $_SERVER['HTTP_HOST'];

scripts/pi-hole/php/header.php

@@ -181,7 +181,13 @@
     <link rel="shortcut icon" href="img/favicons/favicon.ico">
     <meta name="msapplication-TileColor" content="#367fa9">
     <meta name="msapplication-TileImage" content="img/favicons/mstile-150x150.png">
+<?php if ($theme == "default-light") { ?>
     <meta name="theme-color" content="#367fa9">
+<?php } elseif ($theme == "default-dark") { ?>
+    <meta name="theme-color" content="#272c30">
+<?php } elseif ($theme == "default-darker") { ?>
+    <meta name="theme-color" content="#2e6786">
+<?php } ?>
 
 <?php if ($darkmode) { ?>
     <style>