Merge pull request #1850 from pi-hole/release/v5.6

Pi-hole web v5.6

.github/dependabot.yml

@@ -0,0 +1,23 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "10:00"
+  open-pull-requests-limit: 10
+  target-branch: devel
+  versioning-strategy: increase
+  ignore:
+  - dependency-name: postcss
+    versions:
+    - 8.2.6
+    - 8.2.7
+  - dependency-name: xo
+    versions:
+    - 0.38.1
+  - dependency-name: autoprefixer
+    versions:
+    - 10.2.3
+    - 10.2.4

api_FTL.php

@@ -321,7 +321,7 @@
 		$allQueries = array();
 		foreach($return as $line)
 		{
-			$tmp = explode(" ",$line);
+			$tmp = str_getcsv($line," ");
 			// UTF-8 encode domain
 			$tmp[2] = utf8_encode(str_replace("~"," ",$tmp[2]));
 			// UTF-8 encode client host name

api_db.php

@@ -11,6 +11,7 @@
 require("scripts/pi-hole/php/database.php");
 require("scripts/pi-hole/php/password.php");
 require("scripts/pi-hole/php/auth.php");
+require_once("scripts/pi-hole/php/func.php");
 check_cors();
 
 // Set maximum execution time to 10 minutes
@@ -31,7 +32,7 @@ function resolveHostname($clientip, $printIP)
 		return $clientname;
 	}
 
-	else if(filter_var($clientip, FILTER_VALIDATE_IP))
+	else if(validIP($clientip))
 	{
 		// Get host name of client and convert to lower case
 		$clientname = strtolower(gethostbyaddr($ipaddr));

db_queries.php

@@ -45,11 +45,12 @@
         <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><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>

dns_records.php

@@ -39,6 +39,15 @@
                 </div>
             </div>
             <div class="box-footer clearfix">
+              <strong>Note:</strong>
+              <p>The order of locally defined DNS records is: </p>
+              <ol>
+                  <li>The device's host name and <code>pi.hole</code></li>
+                  <li>Configured in a config file in <code>/etc/dnsmasq.d/</code></li>
+                  <li>Read from <code>/etc/hosts</code></li>
+                  <li>Read from the "Local (custom) DNS" list (stored in <code>/etc/pihole/custom.list</code>)</li>
+              </ol>
+              <p>Only the first record will trigger an address-to-name association.</p>
                 <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
             </div>
         </div>

index.php

@@ -59,7 +59,7 @@ function getinterval()
         <!-- small box -->
         <div class="small-box bg-yellow no-user-select">
             <div class="inner">
-                <p>Percent Blocked</p>
+                <p>Percentage Blocked</p>
                 <h3 class="statistic"><span id="percentage_blocked_today">---</span></h3>
             </div>
             <div class="icon">
@@ -150,7 +150,7 @@ function getinterval()
     <div class="col-md-6">
     <div class="box" id="forward-destinations-pie">
         <div class="box-header with-border">
-          <h3 class="box-title">Queries answered by</h3>
+          <h3 class="box-title">Upstream servers</h3>
         </div>
         <div class="box-body">
           <div class="pull-left" style="width:50%">