mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit patches from jim-p:

Browse Source 
1. When deleting a lease, if you were viewing all leases, it should now retain that view after deleting.

2. When checking for leases to clean, bail if there is no leases file. Otherwise there is an ugly error about not being able to open the dhcpd.leases file.
This commit is contained in:
Scott Ullrich 2009-06-21 19:18:48 -04:00
parent a2c59511cd
commit e4fdbcf276
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr/local/www/diag_dhcp_leases.php
View File

@ -66,7 +66,7 @@ if (($_GET['deleteip']) && (is_ipaddr($_GET['deleteip']))) {
/* Restart DHCP Service */
services_dhcpd_configure();
header("Location: diag_dhcp_leases.php");
header("Location: diag_dhcp_leases.php?all={$_GET['all']}");
}
include("head.inc");
@ -364,7 +364,7 @@ foreach ($leases as $data) {
/* Only show the button for offline dynamic leases */
if (($data['type'] == "dynamic") && ($data['online'] != "online")) {
echo "<td class=\"list\" valign=\"middle\"><a href=\"diag_dhcp_leases.php?deleteip={$data['ip']}\">";
echo "<td class=\"list\" valign=\"middle\"><a href=\"diag_dhcp_leases.php?deleteip={$data['ip']}&all={$_GET['all']}\">";
echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"delete this dhcp lease\"></a></td>\n";
}
echo "</tr>\n";

2
usr/local/www/services_dhcp.php
View File

@ -38,6 +38,8 @@ require("guiconfig.inc");
function dhcp_clean_leases() {
global $g, $config;
$leasesfile = "{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases";
if (!file_exists($leasesfile))
return;
/* Build list of static MACs */
$staticmacs = array();
foreach($config['interfaces'] as $ifname => $ifarr)