From 0a4ebe14e33d127ed6ee559ba2a0b7e8e46b9f85 Mon Sep 17 00:00:00 2001
From: Tony <tjeffree@gmail.com>
Date: Tue, 11 Aug 2020 11:43:40 +0100
Subject: [PATCH] Add cache busting to all custom scripts and common css

Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
---
 auditlog.php                   |  4 ++--
 cname_records.php              |  4 ++--
 db_graph.php                   |  4 ++--
 db_lists.php                   |  4 ++--
 db_queries.php                 |  2 +-
 debug.php                      |  2 +-
 dns_records.php                |  6 +++---
 gravity.php                    |  2 +-
 groups-adlists.php             |  4 ++--
 groups-clients.php             |  6 +++---
 groups-domains.php             |  4 ++--
 groups.php                     |  4 ++--
 messages.php                   |  4 ++--
 network.php                    |  6 +++---
 queries.php                    |  6 +++---
 queryads.php                   |  2 +-
 scripts/pi-hole/php/footer.php |  2 +-
 scripts/pi-hole/php/header.php | 32 ++++++++++++++++----------------
 settings.php                   |  4 ++--
 taillog-FTL.php                |  2 +-
 taillog.php                    |  2 +-
 21 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/auditlog.php b/auditlog.php
index 64bf3efb..895dc581 100644
--- a/auditlog.php
+++ b/auditlog.php
@@ -72,8 +72,8 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/auditlog.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/auditlog.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/cname_records.php b/cname_records.php
index c90f7f51..d428ac15 100644
--- a/cname_records.php
+++ b/cname_records.php
@@ -89,8 +89,8 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/customcname.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/customcname.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";
diff --git a/db_graph.php b/db_graph.php
index 1c18a834..8bcc5f5f 100644
--- a/db_graph.php
+++ b/db_graph.php
@@ -68,8 +68,8 @@
 </div>
 
 <script src="scripts/vendor/daterangepicker.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/db_graph.js"></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
     require "scripts/pi-hole/php/footer.php";
diff --git a/db_lists.php b/db_lists.php
index 8a315877..b61aa160 100644
--- a/db_lists.php
+++ b/db_lists.php
@@ -140,8 +140,8 @@ else
 </div>
 
 <script src="scripts/vendor/daterangepicker.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/db_lists.js"></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
     require "scripts/pi-hole/php/footer.php";
diff --git a/db_queries.php b/db_queries.php
index c1d0b6c6..5f86ef37 100644
--- a/db_queries.php
+++ b/db_queries.php
@@ -161,7 +161,7 @@
 <!-- /.row -->
 <script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
 <script src="scripts/vendor/daterangepicker.min.js"></script>
-<script src="scripts/pi-hole/js/db_queries.js"></script>
+<script src="scripts/pi-hole/js/db_queries.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/debug.php b/debug.php
index 0f3ecfae..9c316905 100644
--- a/debug.php
+++ b/debug.php
@@ -19,7 +19,7 @@
 <button type="button" id="debugBtn" class="btn btn-lg btn-primary btn-block">Generate debug log</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="scripts/pi-hole/js/debug.js"></script>
+<script src="scripts/pi-hole/js/debug.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/dns_records.php b/dns_records.php
index dc9e5d5f..e20c2058 100644
--- a/dns_records.php
+++ b/dns_records.php
@@ -89,9 +89,9 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/pi-hole/js/customdns.js"></script>
+<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>
 
 <?php
 require "scripts/pi-hole/php/footer.php";
diff --git a/gravity.php b/gravity.php
index 2e4169fc..cde237c1 100644
--- a/gravity.php
+++ b/gravity.php
@@ -25,7 +25,7 @@
 <button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="scripts/pi-hole/js/gravity.js"></script>
+<script src="scripts/pi-hole/js/gravity.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/groups-adlists.php b/groups-adlists.php
index 97661056..178d8ad7 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -79,8 +79,8 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups-adlists.js"></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
 require "scripts/pi-hole/php/footer.php";
diff --git a/groups-clients.php b/groups-clients.php
index e7c6bea6..88506f53 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -76,9 +76,9 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups-clients.js"></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
 require "scripts/pi-hole/php/footer.php";
diff --git a/groups-domains.php b/groups-domains.php
index 1f015986..05dcd52a 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -140,8 +140,8 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups-domains.js"></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
 require "scripts/pi-hole/php/footer.php";
diff --git a/groups.php b/groups.php
index 18541dda..62a4090a 100644
--- a/groups.php
+++ b/groups.php
@@ -78,8 +78,8 @@
 
 <script src="scripts/vendor/bootstrap-select.min.js"></script>
 <script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/groups.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/groups.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";
diff --git a/messages.php b/messages.php
index 785bd1c4..a4dfb344 100644
--- a/messages.php
+++ b/messages.php
@@ -41,8 +41,8 @@
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/messages.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/messages.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/network.php b/network.php
index b4a76428..1a21cc87 100644
--- a/network.php
+++ b/network.php
@@ -66,9 +66,9 @@
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/pi-hole/js/network.js"></script>
+<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>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/queries.php b/queries.php
index c01882f9..9bd54a77 100644
--- a/queries.php
+++ b/queries.php
@@ -172,9 +172,9 @@ if(strlen($showing) > 0)
     </div>
 </div>
 <!-- /.row -->
-<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/queries.js"></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/queries.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/queryads.php b/queryads.php
index 0f8700f8..826ff3f5 100644
--- a/queryads.php
+++ b/queryads.php
@@ -32,7 +32,7 @@
 
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="scripts/pi-hole/js/queryads.js"></script>
+<script src="scripts/pi-hole/js/queryads.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
index 035cde88..1df5f1d8 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -99,6 +99,6 @@
 
 </div>
 <!-- ./wrapper -->
-<script src="scripts/pi-hole/js/footer.js"></script>
+<script src="scripts/pi-hole/js/footer.js?v=<?=$cacheVer?>"></script>
 </body>
 </html>
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 369d83fd..6f30d51d 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -188,29 +188,29 @@
         html { background-color: #000; }
     </style>
 <?php } ?>
-    <link rel="stylesheet" href="style/vendor/SourceSansPro/SourceSansPro.css">
-    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="style/vendor/font-awesome/css/all.min.css">
-    <link rel="stylesheet" href="style/vendor/datatables.min.css">
-    <link rel="stylesheet" href="style/vendor/daterangepicker.min.css">
+    <link rel="stylesheet" href="style/vendor/SourceSansPro/SourceSansPro.css?v=<?=$cacheVer?>">
+    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap.min.css?v=<?=$cacheVer?>">
+    <link rel="stylesheet" href="style/vendor/font-awesome/css/all.min.css?v=<?=$cacheVer?>">
+    <link rel="stylesheet" href="style/vendor/datatables.min.css?v=<?=$cacheVer?>">
+    <link rel="stylesheet" href="style/vendor/daterangepicker.min.css?v=<?=$cacheVer?>">
     <link rel="stylesheet" href="style/vendor/AdminLTE.min.css?v=<?=$cacheVer?>">
 
 <?php if (in_array($scriptname, array("groups.php", "groups-adlists.php", "groups-clients.php", "groups-domains.php"))){ ?>
-    <link rel="stylesheet" href="style/vendor/animate.min.css">
-    <link rel="stylesheet" href="style/vendor/bootstrap-select.min.css">
-    <link rel="stylesheet" href="style/vendor/bootstrap-toggle.min.css">
+    <link rel="stylesheet" href="style/vendor/animate.min.css?v=<?=$cacheVer?>">
+    <link rel="stylesheet" href="style/vendor/bootstrap-select.min.css?v=<?=$cacheVer?>">
+    <link rel="stylesheet" href="style/vendor/bootstrap-toggle.min.css?v=<?=$cacheVer?>">
 <?php } ?>
     <link rel="stylesheet" href="style/pi-hole.css?v=<?=$cacheVer?>">
     <link rel="stylesheet" href="style/themes/<?php echo $theme; ?>.css?v=<?=$cacheVer?>">
-    <noscript><link rel="stylesheet" href="style/vendor/js-warn.css"></noscript>
+    <noscript><link rel="stylesheet" href="style/vendor/js-warn.css?v=<?=$cacheVer?>"></noscript>
 
-    <script src="scripts/vendor/jquery.min.js"></script>
-    <script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
-    <script src="scripts/vendor/adminlte.min.js"></script>
-    <script src="scripts/vendor/bootstrap-notify.min.js"></script>
-    <script src="scripts/vendor/datatables.min.js"></script>
-    <script src="scripts/vendor/moment.min.js"></script>
-    <script src="scripts/vendor/Chart.min.js"></script>
+    <script src="scripts/vendor/jquery.min.js?v=<?=$cacheVer?>"></script>
+    <script src="style/vendor/bootstrap/js/bootstrap.min.js?v=<?=$cacheVer?>"></script>
+    <script src="scripts/vendor/adminlte.min.js?v=<?=$cacheVer?>"></script>
+    <script src="scripts/vendor/bootstrap-notify.min.js?v=<?=$cacheVer?>"></script>
+    <script src="scripts/vendor/datatables.min.js?v=<?=$cacheVer?>"></script>
+    <script src="scripts/vendor/moment.min.js?v=<?=$cacheVer?>"></script>
+    <script src="scripts/vendor/Chart.min.js?v=<?=$cacheVer?>"></script>
 </head>
 <body class="hold-transition sidebar-mini <?php if($boxedlayout){ ?>layout-boxed<?php } ?>">
 <noscript>
diff --git a/settings.php b/settings.php
index d23525d3..db441a69 100644
--- a/settings.php
+++ b/settings.php
@@ -1422,8 +1422,8 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
 </div>
 
 <script src="scripts/vendor/jquery.confirm.min.js"></script>
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/settings.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/settings.js?v=<?=$cacheVer?>"></script>
 
 <?php
 require "scripts/pi-hole/php/footer.php";
diff --git a/taillog-FTL.php b/taillog-FTL.php
index 78189f6a..1e51660f 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -24,7 +24,7 @@
     <label for="chk2">Automatic scrolling on update</label>
 </div>
 
-<script src="scripts/pi-hole/js/taillog-FTL.js"></script>
+<script src="scripts/pi-hole/js/taillog-FTL.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
diff --git a/taillog.php b/taillog.php
index 232afcee..2041f5e2 100644
--- a/taillog.php
+++ b/taillog.php
@@ -24,7 +24,7 @@
     <label for="chk2">Automatic scrolling on update</label>
 </div>
 
-<script src="scripts/pi-hole/js/taillog.js"></script>
+<script src="scripts/pi-hole/js/taillog.js?v=<?=$cacheVer?>"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";