From 2495ffc3137a7b9dc7da4fc253f2d7967f820a46 Mon Sep 17 00:00:00 2001
From: Tony <tjeffree@gmail.com>
Date: Tue, 11 Aug 2020 09:53:44 +0100
Subject: [PATCH] Add cache busting variable to Pi-hole js/css

Signed-off-by: Tony <tjeffree@gmail.com>
---
 index.php                      | 4 ++--
 scripts/pi-hole/php/header.php | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 1bbf5f39..a50e5593 100644
--- a/index.php
+++ b/index.php
@@ -294,8 +294,8 @@ else
 <!-- /.row -->
 <?php } ?>
 
-<script src="scripts/pi-hole/js/utils.js"></script>
-<script src="scripts/pi-hole/js/index.js"></script>
+<script src="scripts/pi-hole/js/utils.js?v=<?=$cacheVer?>"></script>
+<script src="scripts/pi-hole/js/index.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 2f5305f5..369d83fd 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -14,6 +14,9 @@
     $hostname = gethostname() ? gethostname() : "";
 
     check_cors();
+    
+    // Create cache busting version
+    $cacheVer = filectime(__FILE__);
 
     // Generate CSRF token
     if(empty($_SESSION['token'])) {
@@ -190,15 +193,15 @@
     <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/AdminLTE.min.css">
+    <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">
 <?php } ?>
-    <link rel="stylesheet" href="style/pi-hole.css">
-    <link rel="stylesheet" href="style/themes/<?php echo $theme; ?>.css">
+    <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>
 
     <script src="scripts/vendor/jquery.min.js"></script>