From e4fdbcf2769cae47728662fce02f05494f71b18c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfSense.geekgod.com>
Date: Sun, 21 Jun 2009 19:18:48 -0400
Subject: [PATCH] Commit patches from jim-p:

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.
---
 usr/local/www/diag_dhcp_leases.php | 4 ++--
 usr/local/www/services_dhcp.php    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index 777da4a410..a05447e26c 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -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";
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index b5b75bd45f..96dd735ca6 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -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)