v5.18.1 (#2493)

pi-hole · Jan 15, 2023 · 30668d4 · 30668d4
2 parents 99755ce + 72d12ff
commit 30668d4
Show file tree

Hide file tree

Showing 43 changed files with 4,573 additions and 2,073 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
       -
         name: Spell-Checking
         uses: codespell-project/actions-codespell@master

diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml
@@ -9,6 +9,6 @@ jobs:
     name: editorconfig-checker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v3.3.0
       - uses: editorconfig-checker/action-editorconfig-checker@main
       - run: editorconfig-checker
diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml
@@ -18,4 +18,4 @@ jobs:
           dirtyLabel: "Merge Conflicts"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
-          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+          commentOnClean: "Conflicts have been resolved."
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -6,7 +6,7 @@ jobs:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.2.0
+    - uses: actions/checkout@v3.3.0
     - name: PHP-CS-Fixer
       uses: docker://oskarstark/php-cs-fixer-ga
       with:

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.2.0
+    - uses: actions/checkout@v3.3.0
 
     - name: Install composer
       uses: php-actions/composer@v6

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -13,7 +13,7 @@ jobs:
       issues: write
 
     steps:
-    - uses: actions/stale@v6.0.1
+    - uses: actions/stale@v7.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 30

diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
       - name: Opening pull request
         run: gh pr create -B devel -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
         with:
           node-version: "16.x"
           cache: npm

diff --git a/auditlog.php b/auditlog.php
@@ -79,7 +79,7 @@
 </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
@@ -79,7 +79,7 @@
     </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/composer.lock b/composer.lock
diff --git a/db_graph.php b/db_graph.php
@@ -75,8 +75,8 @@
     </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
@@ -145,8 +145,8 @@
     <!-- /.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
@@ -207,9 +207,9 @@
     </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
@@ -36,7 +36,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?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
@@ -83,8 +83,8 @@
     </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
@@ -28,7 +28,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?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
@@ -83,9 +83,9 @@
     </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
@@ -91,10 +91,10 @@
     </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
@@ -148,9 +148,9 @@
     </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
@@ -80,9 +80,9 @@
     </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
@@ -286,7 +286,7 @@
 </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
@@ -42,6 +42,8 @@
                 <form action="" id="loginform" method="post">
                     <div class="form-group login-options has-feedback<?php if ($wrongpassword) { ?> has-error<?php } ?>">
                         <div class="pwd-field">
+                            <!-- hidden username input field to help password managers to autfill the password -->
+                            <input type="text" id="username" value="pi.hole" autocomplete="username" hidden>
                             <input type="password" id="loginpw" name="pw" class="form-control" placeholder="Password" spellcheck="false" autocomplete="current-password" autofocus>
                             <span class="fa fa-key form-control-feedback"></span>
                         </div>
@@ -93,6 +95,6 @@
         <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
@@ -47,7 +47,7 @@
     </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
@@ -66,8 +66,8 @@
 </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';