diff options
author | Jim P <jim@pingle.org> | 2012-09-18 05:07:34 -0700 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2012-09-18 05:07:34 -0700 |
commit | f6e4341d14a56c6ff6ef0f8059d71e0caed1e4d5 (patch) | |
tree | 254832a8b80312edea010d128518f12e1777080a /usr/local/www | |
parent | db4fb43079eff00cb30b9babe011cb6c0af69105 (diff) | |
parent | f6fef11d6362786e7f4d35b307c4bb1c60ef4a80 (diff) | |
download | pfsense-f6e4341d14a56c6ff6ef0f8059d71e0caed1e4d5.zip pfsense-f6e4341d14a56c6ff6ef0f8059d71e0caed1e4d5.tar.gz |
Merge pull request #224 from phil-davis/master
Fix deleting DHCP leases
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/status_dhcp_leases.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php index c7a0c2d..45687b8 100755 --- a/usr/local/www/status_dhcp_leases.php +++ b/usr/local/www/status_dhcp_leases.php @@ -56,16 +56,17 @@ if (($_GET['deleteip']) && (is_ipaddr($_GET['deleteip']))) { killbyname("dhcpd"); /* Read existing leases */ + /* $leases_contents has the lines of the file, including the newline char at the end of each line. */ $leases_contents = file($leasesfile); $newleases_contents = array(); $i=0; while ($i < count($leases_contents)) { /* Find the lease(s) we want to delete */ - if ($leases_contents[$i] == "lease {$_GET['deleteip']} {") { + if ($leases_contents[$i] == "lease {$_GET['deleteip']} {\n") { /* Skip to the end of the lease declaration */ do { $i++; - } while ($leases_contents[$i] != "}"); + } while ($leases_contents[$i] != "}\n"); } else { /* It's a line we want to keep, copy it over. */ $newleases_contents[] = $leases_contents[$i]; |