From 302a40227754f2ab872931bc2b494a305e717ffe Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Fri, 13 Jan 2023 17:51:35 -0300
Subject: [PATCH] Avoid caching issues using last modified time

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 auditlog.php                   |  2 +-
 cname_records.php              |  2 +-
 db_graph.php                   |  4 +--
 db_lists.php                   |  4 +--
 db_queries.php                 |  6 ++--
 debug.php                      |  2 +-
 dns_records.php                |  4 +--
 gravity.php                    |  2 +-
 groups-adlists.php             |  6 ++--
 groups-clients.php             |  8 ++---
 groups-domains.php             |  6 ++--
 groups.php                     |  6 ++--
 index.php                      |  2 +-
 login.php                      |  2 +-
 messages.php                   |  2 +-
 network.php                    |  4 +--
 queries.php                    |  4 +--
 queryads.php                   |  2 +-
 scripts/pi-hole/php/footer.php |  2 +-
 scripts/pi-hole/php/func.php   | 13 ++++++++
 scripts/pi-hole/php/header.php | 59 ++++++++++++++++------------------
 settings.php                   |  4 +--
 taillog-FTL.php                |  2 +-
 taillog.php                    |  2 +-
 24 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/auditlog.php b/auditlog.php
index 1358b14e..3c311ac6 100644
--- a/auditlog.php
+++ b/auditlog.php
@@ -79,7 +79,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/auditlog.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/auditlog.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/cname_records.php b/cname_records.php
index 017fa014..323ba476 100644
--- a/cname_records.php
+++ b/cname_records.php
@@ -79,7 +79,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/customcname.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/customcname.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/db_graph.php b/db_graph.php
index 6ea41e8d..613e2891 100644
--- a/db_graph.php
+++ b/db_graph.php
@@ -75,8 +75,8 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/vendor/daterangepicker.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/db_graph.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/daterangepicker.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/db_graph.js'); ?>"></script>
 <?php
 require 'scripts/pi-hole/php/footer.php';
 ?>
diff --git a/db_lists.php b/db_lists.php
index 25e2677a..b8e17b76 100644
--- a/db_lists.php
+++ b/db_lists.php
@@ -145,8 +145,8 @@ if ($boxedlayout) {
     <!-- /.col -->
 </div>
 
-<script src="scripts/vendor/daterangepicker.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/db_lists.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/daterangepicker.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/db_lists.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/db_queries.php b/db_queries.php
index af5b0af1..1bba7e59 100644
--- a/db_queries.php
+++ b/db_queries.php
@@ -207,9 +207,9 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 <!-- /.row -->
-<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/vendor/daterangepicker.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/db_queries.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/daterangepicker.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/db_queries.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/debug.php b/debug.php
index b426ee67..52d9af48 100644
--- a/debug.php
+++ b/debug.php
@@ -36,7 +36,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
 <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?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/debug.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/dns_records.php b/dns_records.php
index 9e3c55b6..25870f4e 100644
--- a/dns_records.php
+++ b/dns_records.php
@@ -83,8 +83,8 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/customdns.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/customdns.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/gravity.php b/gravity.php
index 49bd0070..99f2636b 100644
--- a/gravity.php
+++ b/gravity.php
@@ -28,7 +28,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
 <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?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/gravity.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/groups-adlists.php b/groups-adlists.php
index dd9d1c7d..e80dd505 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -83,9 +83,9 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/groups-adlists.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-select.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-toggle.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/groups-adlists.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/groups-clients.php b/groups-clients.php
index f85987fa..3867a5d1 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -91,10 +91,10 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/groups-clients.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-select.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-toggle.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/groups-clients.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/groups-domains.php b/groups-domains.php
index 2ac14dd6..f49f8f4e 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -148,9 +148,9 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/groups-domains.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-select.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-toggle.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/groups-domains.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/groups.php b/groups.php
index b48d8dae..66247bb5 100644
--- a/groups.php
+++ b/groups.php
@@ -80,9 +80,9 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/vendor/bootstrap-select.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/vendor/bootstrap-toggle.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/groups.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-select.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/bootstrap-toggle.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/groups.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/index.php b/index.php
index e460fbf4..45482daa 100644
--- a/index.php
+++ b/index.php
@@ -286,7 +286,7 @@ require_once 'scripts/pi-hole/php/gravity.php';
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/index.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/index.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/login.php b/login.php
index fe2fc6a2..34b11da3 100644
--- a/login.php
+++ b/login.php
@@ -95,6 +95,6 @@ require 'scripts/pi-hole/php/header.php';
         <strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
     </div>
 </div>
-<script src="scripts/pi-hole/js/footer.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/footer.js'); ?>"></script>
 </body>
 </html>
diff --git a/messages.php b/messages.php
index 1c8b47c7..4fc0abf3 100644
--- a/messages.php
+++ b/messages.php
@@ -47,7 +47,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     </div>
 </div>
 
-<script src="scripts/pi-hole/js/messages.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/messages.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/network.php b/network.php
index a9c4e8d3..ba0f5090 100644
--- a/network.php
+++ b/network.php
@@ -66,8 +66,8 @@ require 'scripts/pi-hole/php/header_authenticated.php';
 </div>
 <!-- /.row -->
 
-<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/network.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/network.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/queries.php b/queries.php
index 3ba894f7..3266e471 100644
--- a/queries.php
+++ b/queries.php
@@ -151,8 +151,8 @@ if (strlen($showing) > 0) {
     </div>
 </div>
 <!-- /.row -->
-<script src="scripts/pi-hole/js/ip-address-sorting.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/queries.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/ip-address-sorting.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/queries.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/queryads.php b/queryads.php
index 1c069d4e..d7df9339 100644
--- a/queryads.php
+++ b/queryads.php
@@ -41,7 +41,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
 
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="scripts/pi-hole/js/queryads.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/queryads.js'); ?>"></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 c4ca7a1d..e96cf20a 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -102,6 +102,6 @@ if (isset($core_commit) || isset($web_commit) || isset($FTL_commit)) {
 
 </div>
 <!-- ./wrapper -->
-<script src="scripts/pi-hole/js/footer.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/footer.js'); ?>"></script>
 </body>
 </html>
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
index ef1a514b..a36cdba7 100644
--- a/scripts/pi-hole/php/func.php
+++ b/scripts/pi-hole/php/func.php
@@ -111,6 +111,19 @@ function checkfile($filename)
     return '/dev/null';
 }
 
+// Avoid browser caching old versions of a file, using the last modification time
+//   Receive the file URL (without "/admin/");
+//   Return the string containin URL + "?v=xxx", where xxx is the last modified time of the file.
+function fileversion($url)
+{
+    $filename = $_SERVER['DOCUMENT_ROOT'].'/admin/'.$url;
+    if (file_exists($filename)) {
+        $ver = filemtime($filename);
+    }
+
+    return $url.'?v='.$ver;
+}
+
 // Credit: http://php.net/manual/en/function.hash-equals.php#119576
 if (!function_exists('hash_equals')) {
     function hash_equals($known_string, $user_string)
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index ddfe5af7..e0619177 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -1,9 +1,6 @@
 <?php
 $scriptname = basename($_SERVER['SCRIPT_FILENAME']);
 $hostname = gethostname() ? gethostname() : '';
-
-// Create cache busting version
-$cacheVer = filemtime(__FILE__);
 ?>
 <!DOCTYPE html>
 <!--
@@ -53,49 +50,49 @@ $cacheVer = filemtime(__FILE__);
 
     <!-- Theme fonts -->
 <?php if ($theme == 'lcars') { ?>
-    <link rel="stylesheet" href="style/vendor/fonts/ubuntu-mono/ubuntu-mono.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/vendor/fonts/antonio/antonio.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/fonts/ubuntu-mono/ubuntu-mono.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/fonts/antonio/antonio.css'); ?>">
 <?php } else { ?>
-    <link rel="stylesheet" href="style/vendor/SourceSansPro/SourceSansPro.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/SourceSansPro/SourceSansPro.css'); ?>">
 <?php } ?>
 
     <!-- Common styles -->
-    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap.min.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/bootstrap/css/bootstrap.min.css'); ?>">
 <?php if ($auth) { ?>
-    <link rel="stylesheet" href="style/vendor/datatables.min.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/vendor/datatables_extensions.min.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/vendor/daterangepicker.min.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/datatables.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/datatables_extensions.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/daterangepicker.min.css'); ?>">
 <?php } ?>
-    <link rel="stylesheet" href="style/vendor/AdminLTE.min.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/vendor/select2.min.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/AdminLTE.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/select2.min.css'); ?>">
 
 <?php if (in_array($scriptname, array('groups.php', 'groups-adlists.php', 'groups-clients.php', 'groups-domains.php'))) { ?>
     <!-- Group management styles -->
-    <link rel="stylesheet" href="style/vendor/animate.min.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/vendor/bootstrap-select.min.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/vendor/bootstrap-toggle.min.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/animate.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/bootstrap-select.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/vendor/bootstrap-toggle.min.css'); ?>">
 <?php } ?>
 
     <!-- Theme styles -->
-    <link rel="stylesheet" href="style/pi-hole.css?v=<?php echo $cacheVer; ?>">
-    <link rel="stylesheet" href="style/themes/<?php echo $theme; ?>.css?v=<?php echo $cacheVer; ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/pi-hole.css'); ?>">
+    <link rel="stylesheet" href="<?php echo fileversion('style/themes/'.$theme.'.css'); ?>">
 
-    <noscript><link rel="stylesheet" href="style/vendor/js-warn.css?v=<?php echo $cacheVer; ?>"></noscript>
+    <noscript><link rel="stylesheet" href="<?php echo fileversion('style/vendor/js-warn.css'); ?>"></noscript>
 
     <!-- scripts -->
-    <script src="scripts/vendor/jquery.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="style/vendor/bootstrap/js/bootstrap.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/adminlte.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/bootstrap-notify.min.js?v=<?php echo $cacheVer; ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/jquery.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('style/vendor/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/adminlte.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/bootstrap-notify.min.js'); ?>"></script>
 <?php if ($auth) { ?>
-    <script src="scripts/vendor/select2.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/datatables.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/datatables.select.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/datatables.buttons.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/moment.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/chart.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/vendor/chartjs-adapter-moment.js?v=<?php echo $cacheVer; ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/select2.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/datatables.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/datatables.select.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/datatables.buttons.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/moment.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/chart.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/vendor/chartjs-adapter-moment.js'); ?>"></script>
 <?php } ?>
-    <script src="style/vendor/font-awesome/js/all.min.js?v=<?php echo $cacheVer; ?>"></script>
-    <script src="scripts/pi-hole/js/utils.js?v=<?php echo $cacheVer; ?>"></script>
+    <script src="<?php echo fileversion('style/vendor/font-awesome/js/all.min.js'); ?>"></script>
+    <script src="<?php echo fileversion('scripts/pi-hole/js/utils.js'); ?>"></script>
 </head>
diff --git a/settings.php b/settings.php
index 7ff980f6..f024b894 100644
--- a/settings.php
+++ b/settings.php
@@ -1462,8 +1462,8 @@ if (isset($piholeFTLConf['RATE_LIMIT'])) {
     </div>
 </div>
 
-<script src="scripts/vendor/jquery.confirm.min.js?v=<?php echo $cacheVer; ?>"></script>
-<script src="scripts/pi-hole/js/settings.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/vendor/jquery.confirm.min.js'); ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/settings.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/taillog-FTL.php b/taillog-FTL.php
index cc9de3fd..6978625a 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -27,7 +27,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     <label for="chk2">Automatic scrolling on update</label>
 </div>
 
-<script src="scripts/pi-hole/js/taillog-FTL.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/taillog-FTL.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';
diff --git a/taillog.php b/taillog.php
index 69b25d1e..db7f9513 100644
--- a/taillog.php
+++ b/taillog.php
@@ -27,7 +27,7 @@ require 'scripts/pi-hole/php/header_authenticated.php';
     <label for="chk2">Automatic scrolling on update</label>
 </div>
 
-<script src="scripts/pi-hole/js/taillog.js?v=<?php echo $cacheVer; ?>"></script>
+<script src="<?php echo fileversion('scripts/pi-hole/js/taillog.js'); ?>"></script>
 
 <?php
 require 'scripts/pi-hole/php/footer.php';