Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v4.2' into devel

Browse Source 
# Conflicts:
#	scripts/pi-hole/js/db_graph.js
This commit is contained in:
Mcat12
2019-02-03 11:24:19 -08:00
parent a2615c8c00 f2b2aa42c0
commit 2ba8787261
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/pi-hole/php/savesettings.php
View File

@@ -578,6 +578,11 @@ function readAdlists()
$error .= "Static release for MAC address (".htmlspecialchars($mac).") already defined!<br>";
break;
}
if($ip !== "noip" && $lease["IP"] === $ip)
{
$error .= "Static lease for IP address (".htmlspecialchars($ip).") already defined!<br>";
break;
}
}
if(!strlen($error))