Merge pull request #2016 from pi-hole/devel

Pi-hole web v5.9
pi-hole · Dec 22, 2021 · 193fb7f · 193fb7f
2 parents ee50954 + 76a6344
commit 193fb7f
Show file tree

Hide file tree

Showing 59 changed files with 3,792 additions and 1,808 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,6 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - dependabot
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -9,6 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Change PHP version
+      run: |
+        sudo update-alternatives --set php /usr/bin/php8.0
+        sudo update-alternatives --set phar /usr/bin/phar8.0
+        sudo update-alternatives --set phpdbg /usr/bin/phpdbg8.0
+        sudo update-alternatives --set php-cgi /usr/bin/php-cgi8.0
+        sudo update-alternatives --set phar.phar /usr/bin/phar.phar8.0
+        php -version
     - name: Validate composer.json and composer.lock
       run: composer validate
     - name: Cache Composer packages

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,4 +31,4 @@ jobs:
         run: npm ci
 
       - name: Run tests
-        run: npm test
+        run: npm run testpr
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ The Web interface is enabled by default when you install Pi-hole.
 
 There are several ways to [access the dashboard](https://discourse.pi-hole.net/t/how-do-i-access-pi-holes-dashboard-admin-interface/3168):
 
-1. `http://<IP_ADDPRESS_OF_YOUR_PI_HOLE>/admin/`
+1. `http://<IP_ADDRESS_OF_YOUR_PI_HOLE>/admin/`
 2. `http:/pi.hole/admin/` (when using Pi-hole as your DNS server)
 3. `http://pi.hole/` (when using Pi-hole as your DNS server)
 
@@ -46,7 +46,7 @@ Once logged in (forgot your password?), you can view your network stats to see t
 
 ## Pi-hole is free, but powered by your support
 
-There are many reoccurring costs involved with maintaining free, open source, and privacy respecting software; expenses which [our volunteer developers](https://github.com/orgs/pi-hole/people) pitch in to cover out-of-pocket. This is just one example of how strongly we feel about our software, as well as the importance of keeping it maintained.
+There are many reoccurring costs involved with maintaining free, open source, and privacy-respecting software; expenses which [our volunteer developers](https://github.com/orgs/pi-hole/people) pitch in to cover out-of-pocket. This is just one example of how strongly we feel about our software, as well as the importance of keeping it maintained.
 
 Make no mistake: **your support is absolutely vital to help keep us innovating!**
 
@@ -73,7 +73,7 @@ If you'd rather not [donate](https://pi-hole.net/donate/) (_which is okay!_), th
 
 We welcome _everyone_ to contribute to issue reports, suggest new features, and create pull requests.
 
-If you have something to add - anything from a typo through to a whole new feature, we're happy to check it out! Just make sure to fill out our template when submitting your request; the questions that it asks will help the volunteers quickly understand what you're aiming to achieve.
+If you have something to add - anything from a typo through to a whole new feature - we're happy to check it out! Just make sure to fill out our template when submitting your request; the questions that it asks will help the volunteers quickly understand what you're aiming to achieve.
 
 ### Presentations about Pi-hole
 

diff --git a/auditlog.php b/auditlog.php
@@ -23,12 +23,14 @@
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Domain</th>
-                    <th>Hits</th>
-                    <th>Actions</th>
+                      <th>Domain</th>
+                      <th>Hits</th>
+                      <th>Actions</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>
@@ -51,12 +53,14 @@
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Domain</th>
-                    <th>Hits</th>
-                    <th>Actions</th>
+                      <th>Domain</th>
+                      <th>Hits</th>
+                      <th>Actions</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>

diff --git a/db_graph.php b/db_graph.php
@@ -7,6 +7,11 @@
 *    Please see LICENSE file for your rights under this license. */
     require "scripts/pi-hole/php/header.php";
 ?>
+<!-- Sourceing CSS colors from stylesheet to be used in JS code -->
+<span class="queries-permitted"></span>
+<span class="queries-blocked"></span>
+<span class="graphs-grid"></span>
+<span class="graphs-ticks"></span>
 
 <div class="page-header">
     <h1>Compute graphical statistics from the Pi-hole query database</h1>

diff --git a/db_lists.php b/db_lists.php
@@ -65,12 +65,14 @@
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Domain</th>
-                    <th>Hits</th>
-                    <th>Frequency</th>
+                      <th>Domain</th>
+                      <th>Hits</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>
@@ -92,12 +94,14 @@
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Domain</th>
-                    <th>Hits</th>
-                    <th>Frequency</th>
+                      <th>Domain</th>
+                      <th>Hits</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>
@@ -119,12 +123,14 @@
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Client</th>
-                    <th>Requests</th>
-                    <th>Frequency</th>
+                      <th>Client</th>
+                      <th>Requests</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>

diff --git a/db_queries.php b/db_queries.php
@@ -22,6 +22,12 @@
         </h3>
       </div>
       <div class="box-body">
+        <div class="alert alert-info reload-box">
+            <div>
+                <span><i class="fa fa-exclamation-circle"></i>&nbsp; New options selected. Please reload the data or choose another time range.</span>
+                <button type="button" class="btn btn-primary bt-reload">Reload Data</button>
+            </div>
+        </div>
         <div class="row">
           <div class="form-group col-md-12">
             <div class="input-group">
@@ -32,38 +38,37 @@
             </div>
           </div>
         </div>
+        <div class="row">
+            <div class="col-md-12">
+                <label>Query status:</label>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <div><input type="checkbox" id="type_forwarded" checked><label for="type_forwarded">Permitted: forwarded</label><br></div>
+                    <div><input type="checkbox" id="type_cached" checked><label for="type_cached">Permitted: cached</label></div>
+                    <div><input type="checkbox" id="type_retried" checked><label for="type_retried">Permitted: retried</label></div>
+                </div>
+                <div class="col-md-3">
+                    <div><input type="checkbox" id="type_gravity" checked><label for="type_gravity">Blocked: gravity</label><br></div>
+                    <div><input type="checkbox" id="type_external" checked><label for="type_external">Blocked: external</label></div>
+                    <div><input type="checkbox" id="type_dbbusy" checked><label for="type_dbbusy">Blocked: database busy</label></div>
+                </div>
+                <div class="col-md-3">
+                    <div><input type="checkbox" id="type_blacklist" checked><label for="type_blacklist">Blocked: exact blacklist</label><br></div>
+                    <div><input type="checkbox" id="type_regex" checked><label for="type_regex">Blocked: regex blacklist</label></div>
+                </div>
+                <div class="col-md-3">
+                    <div><input type="checkbox" id="type_gravity_CNAME" checked><label for="type_gravity_CNAME">Blocked: gravity (CNAME)</label><br></div>
+                    <div><input type="checkbox" id="type_blacklist_CNAME" checked><label for="type_blacklist_CNAME">Blocked: exact blacklist (CNAME)</label><br></div>
+                    <div><input type="checkbox" id="type_regex_CNAME" checked><label for="type_regex_CNAME">Blocked: regex blacklist (CNAME)</label></div>
+                </div>
+            </div>
+        </div>
       </div>
     </div>
   </div>
 </div>
 
-<div class="row">
-    <div class="col-md-12">
-        <label>Query status:</label>
-    </div>
-    <div class="form-group">
-        <div class="col-md-3">
-            <div><input type="checkbox" id="type_forwarded" checked><label for="type_forwarded">Permitted: forwarded</label><br></div>
-            <div><input type="checkbox" id="type_cached" checked><label for="type_cached">Permitted: cached</label></div>
-            <div><input type="checkbox" id="type_retried" checked><label for="type_retried">Permitted: retried</label></div>
-        </div>
-        <div class="col-md-3">
-            <div><input type="checkbox" id="type_gravity" checked><label for="type_gravity">Blocked: gravity</label><br></div>
-            <div><input type="checkbox" id="type_external" checked><label for="type_external">Blocked: external</label></div>
-            <div><input type="checkbox" id="type_dbbusy" checked><label for="type_dbbusy">Blocked: database busy</label></div>
-        </div>
-        <div class="col-md-3">
-            <div><input type="checkbox" id="type_blacklist" checked><label for="type_blacklist">Blocked: exact blacklist</label><br></div>
-            <div><input type="checkbox" id="type_regex" checked><label for="type_regex">Blocked: regex blacklist</label></div>
-        </div>
-        <div class="col-md-3">
-            <div><input type="checkbox" id="type_gravity_CNAME" checked><label for="type_gravity_CNAME">Blocked: gravity (CNAME)</label><br></div>
-            <div><input type="checkbox" id="type_blacklist_CNAME" checked><label for="type_blacklist_CNAME">Blocked: exact blacklist (CNAME)</label><br></div>
-            <div><input type="checkbox" id="type_regex_CNAME" checked><label for="type_regex_CNAME">Blocked: regex blacklist (CNAME)</label></div>
-        </div>
-    </div>
-</div>
-
 <div id="timeoutWarning" class="alert alert-warning alert-dismissible fade in" role="alert" hidden>
     Depending on how large of a range you specified, the request may time out while Pi-hole tries to retrieve all the data.<br/><span id="err"></span>
 </div>

diff --git a/img/favicons/apple-touch-icon.png b/img/favicons/apple-touch-icon.png
diff --git a/index.php b/index.php
@@ -188,12 +188,14 @@ function getinterval()
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Domain</th>
-                    <th>Hits</th>
-                    <th>Frequency</th>
+                      <th>Domain</th>
+                      <th>Hits</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>
@@ -215,12 +217,14 @@ function getinterval()
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Domain</th>
-                    <th>Hits</th>
-                    <th>Frequency</th>
+                      <th>Domain</th>
+                      <th>Hits</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>
@@ -244,12 +248,14 @@ function getinterval()
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Client</th>
-                    <th>Requests</th>
-                    <th>Frequency</th>
+                      <th>Client</th>
+                      <th>Requests</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>
@@ -272,12 +278,14 @@ function getinterval()
         <div class="box-body">
             <div class="table-responsive">
                 <table class="table table-bordered">
-                  <tbody>
+                  <thead>
                     <tr>
-                    <th>Client</th>
-                    <th>Requests</th>
-                    <th>Frequency</th>
+                      <th>Client</th>
+                      <th>Requests</th>
+                      <th>Frequency</th>
                     </tr>
+                  </thead>
+                  <tbody>
                   </tbody>
                 </table>
             </div>

diff --git a/messages.php b/messages.php
@@ -35,6 +35,7 @@
                     </tr>
                     </thead>
                 </table>
+                <p>Note: If errors are shown, you can <a href="debug.php">generate a debug log</a>, which will do a thorough Pi-hole evaluation.</p>
             </div>
             <!-- /.box-body -->
         </div>

diff --git a/network.php b/network.php
@@ -8,12 +8,6 @@
     require "scripts/pi-hole/php/header.php";
 ?>
 
-<!-- Sourceing CSS colors from stylesheet to be used in JS code -->
-<span class="queries-permitted"></span>
-<span class="queries-blocked"></span>
-<span class="graphs-grid"></span>
-<span class="graphs-ticks"></span>
-
 <div class="row">
     <div class="col-md-12">
       <div class="box" id="network-details">