From 139ca5491b8ad36ff65d902f0bde2b1ea106477d Mon Sep 17 00:00:00 2001
From: Will Boyce <me@willboyce.com>
Date: Sat, 30 May 2015 10:59:42 -0300
Subject: remove pointless filter on dhcp static mappings table

---
 usr/local/www/services_dhcp.php      | 2 --
 usr/local/www/status_dhcp_leases.php | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index 69846d5..a08e8fd 100644
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -1237,7 +1237,6 @@ include("head.inc");
 		</tr>
 			<?php if(is_array($a_maps)): ?>
 			<?php $i = 0; foreach ($a_maps as $mapent): ?>
-			<?php if($mapent['mac'] <> "" or $mapent['ipaddr'] <> ""): ?>
 		<tr>
 		<td align="center" class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
 			<?php if (isset($mapent['arp_table_static_entry'])): ?>
@@ -1265,7 +1264,6 @@ include("head.inc");
 			</table>
 		</td>
 		</tr>
-		<?php endif; ?>
 		<?php $i++; endforeach; ?>
 		<?php endif; ?>
 		<tr>
diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php
index 158a733..b6b88c9 100644
--- a/usr/local/www/status_dhcp_leases.php
+++ b/usr/local/www/status_dhcp_leases.php
@@ -354,7 +354,7 @@ foreach ($pools as $data) {
 // Load MAC-Manufacturer table
 $mac_man = load_mac_manufacturer_table();
 foreach ($leases as $data) {
-	if (($data['act'] == "active") || ($data['act'] == "static") || ($_GET['all'] == 1)) {
+	if (($data['act'] == "active") || ($data['act'] == "static" && !empty($data['ip'])) || ($_GET['all'] == 1)) {
 		if ($data['act'] != "active" && $data['act'] != "static") {
 			$fspans = "<span class=\"gray\">";
 			$fspane = "&nbsp;</span>";
-- 
cgit v1.1