From 7ed501d468641f5466aeb1634d8deff8da9f90fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Tue, 15 Mar 2022 16:29:55 +0100
Subject: [PATCH 1/3] Include message triangle on all pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 debug.php       | 1 +
 gravity.php     | 1 +
 queryads.php    | 1 +
 taillog-FTL.php | 2 ++
 taillog.php     | 1 +
 5 files changed, 6 insertions(+)

diff --git a/debug.php b/debug.php
index 9c316905..e05c1892 100644
--- a/debug.php
+++ b/debug.php
@@ -20,6 +20,7 @@
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
 <script src="scripts/pi-hole/js/debug.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/gravity.php b/gravity.php
index cde237c1..53e49352 100644
--- a/gravity.php
+++ b/gravity.php
@@ -26,6 +26,7 @@
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
 <script src="scripts/pi-hole/js/gravity.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/queryads.php b/queryads.php
index 1eb1fe5d..88dd2582 100644
--- a/queryads.php
+++ b/queryads.php
@@ -33,6 +33,7 @@
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
 <script src="scripts/pi-hole/js/queryads.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/taillog-FTL.php b/taillog-FTL.php
index 1e51660f..776ecaf6 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -25,6 +25,8 @@
 </div>
 
 <script src="scripts/pi-hole/js/taillog-FTL.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/taillog.php b/taillog.php
index 2041f5e2..d76b87d9 100644
--- a/taillog.php
+++ b/taillog.php
@@ -25,6 +25,7 @@
 </div>
 
 <script src="scripts/pi-hole/js/taillog.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

From 6ab9ef0ef30bbc9cda236f31f48fc3a539f1411d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Wed, 16 Mar 2022 11:11:11 +0100
Subject: [PATCH 2/3] Source utils.js in header.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 auditlog.php                   | 1 -
 cname_records.php              | 1 -
 db_graph.php                   | 1 -
 db_lists.php                   | 1 -
 db_queries.php                 | 1 -
 debug.php                      | 1 -
 dns_records.php                | 1 -
 gravity.php                    | 1 -
 groups-adlists.php             | 1 -
 groups-clients.php             | 1 -
 groups-domains.php             | 1 -
 groups.php                     | 1 -
 index.php                      | 1 -
 messages.php                   | 1 -
 network.php                    | 1 -
 queries.php                    | 1 -
 queryads.php                   | 2 --
 scripts/pi-hole/php/header.php | 3 +++
 settings.php                   | 1 -
 taillog-FTL.php                | 2 --
 taillog.php                    | 1 -
 21 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/auditlog.php b/auditlog.php
index 9825cb01..fd1219ed 100644
--- a/auditlog.php
+++ b/auditlog.php
@@ -76,7 +76,6 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/auditlog.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/cname_records.php b/cname_records.php
index 53dcdab5..a6a89ab1 100644
--- a/cname_records.php
+++ b/cname_records.php
@@ -94,7 +94,6 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/customcname.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/db_graph.php b/db_graph.php
index 11478c2f..07fc7067 100644
--- a/db_graph.php
+++ b/db_graph.php
@@ -73,7 +73,6 @@
 </div>
 
 <script src="scripts/vendor/daterangepicker.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/db_graph.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/db_lists.php b/db_lists.php
index 8832b965..34951ab5 100644
--- a/db_lists.php
+++ b/db_lists.php
@@ -146,7 +146,6 @@ else
 </div>
 
 <script src="scripts/vendor/daterangepicker.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/db_lists.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/db_queries.php b/db_queries.php
index 64b5c1c5..8ce45f10 100644
--- a/db_queries.php
+++ b/db_queries.php
@@ -202,7 +202,6 @@
 <!-- /.row -->
 <script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/vendor/daterangepicker.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/db_queries.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/debug.php b/debug.php
index e05c1892..9c316905 100644
--- a/debug.php
+++ b/debug.php
@@ -20,7 +20,6 @@
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
 <script src="scripts/pi-hole/js/debug.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/dns_records.php b/dns_records.php
index 36311ef2..1782d146 100644
--- a/dns_records.php
+++ b/dns_records.php
@@ -98,7 +98,6 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/customdns.js?v=<?=$cacheVer?>"></script>
 
diff --git a/gravity.php b/gravity.php
index 53e49352..cde237c1 100644
--- a/gravity.php
+++ b/gravity.php
@@ -26,7 +26,6 @@
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
 <script src="scripts/pi-hole/js/gravity.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/groups-adlists.php b/groups-adlists.php
index 04ec7294..5a4688e5 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -81,7 +81,6 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/groups-adlists.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/groups-clients.php b/groups-clients.php
index 420ce5c8..2257b0de 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -88,7 +88,6 @@
 <script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/groups-clients.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/groups-domains.php b/groups-domains.php
index 25f86eee..3877c89a 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -140,7 +140,6 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/groups-domains.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/groups.php b/groups.php
index 0cf970f7..22e741e7 100644
--- a/groups.php
+++ b/groups.php
@@ -78,7 +78,6 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/groups.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/index.php b/index.php
index ace5f700..ded23eca 100644
--- a/index.php
+++ b/index.php
@@ -290,7 +290,6 @@ else
 <!-- /.row -->
 <?php } ?>
 
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/index.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/messages.php b/messages.php
index d6c6b15a..d1ab319e 100644
--- a/messages.php
+++ b/messages.php
@@ -44,7 +44,6 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/messages.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/network.php b/network.php
index e9ecea59..acc398b8 100644
--- a/network.php
+++ b/network.php
@@ -64,7 +64,6 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/network.js?v=<?=$cacheVer?>"></script>
 
diff --git a/queries.php b/queries.php
index a64b2555..1b008f6a 100644
--- a/queries.php
+++ b/queries.php
@@ -176,7 +176,6 @@ if(strlen($showing) > 0)
 </div>
 <!-- /.row -->
 <script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/queries.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/queryads.php b/queryads.php
index 88dd2582..1f7dbb59 100644
--- a/queryads.php
+++ b/queryads.php
@@ -33,8 +33,6 @@
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
 <script src="scripts/pi-hole/js/queryads.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
-
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 6c8665ea..7997bba2 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -662,6 +662,9 @@ if($auth) {
     <div class="content-wrapper">
         <!-- Main content -->
         <section class="content">
+          
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+
 <?php
     // If password is not equal to the password set
     // in the setupVars.conf file, then we skip any
diff --git a/settings.php b/settings.php
index c7e6e21b..0d011a75 100644
--- a/settings.php
+++ b/settings.php
@@ -1472,7 +1472,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
 </div>
 
 <script src="scripts/vendor/jquery.confirm.min.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 <script src="scripts/pi-hole/js/settings.js?v=<?=$cacheVer?>"></script>
 
 <?php
diff --git a/taillog-FTL.php b/taillog-FTL.php
index 776ecaf6..1e51660f 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -25,8 +25,6 @@
 </div>
 
 <script src="scripts/pi-hole/js/taillog-FTL.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
-
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/taillog.php b/taillog.php
index d76b87d9..2041f5e2 100644
--- a/taillog.php
+++ b/taillog.php
@@ -25,7 +25,6 @@
 </div>
 
 <script src="scripts/pi-hole/js/taillog.js?v=<?=$cacheVer?>"></script>
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";

From acd70b378f258439a77161df24b3cb4df9ef8153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Wed, 16 Mar 2022 18:35:01 +0100
Subject: [PATCH 3/3] I was blind but now I see!
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/header.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 7997bba2..a5d43a0d 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -229,6 +229,7 @@
     <script src="scripts/vendor/moment.min.js?v=<?=$cacheVer?>"></script>
     <script src="scripts/vendor/Chart.min.js?v=<?=$cacheVer?>"></script>
     <script src="style/vendor/font-awesome/js/all.min.js?v=<?=$cacheVer?>"></script>
+    <script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
 </head>
 <body class="hold-transition sidebar-mini <?php if($boxedlayout){ ?>layout-boxed<?php } ?>">
 <noscript>
@@ -662,9 +663,6 @@ if($auth) {
     <div class="content-wrapper">
         <!-- Main content -->
         <section class="content">
-          
-<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
-
 <?php
     // If password is not equal to the password set
     // in the setupVars.conf file, then we skip any