summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Boyce <me@willboyce.com>2015-05-30 10:57:18 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-05-30 10:57:18 -0300
commit4199bda9026c654d8438f5a7894b0e4c1857a5af (patch)
tree9485a44443eb686a1f73fcb8adf7e979e408de1c
parenta47eec851ed93d6874857818b8edffed35e526c6 (diff)
downloadpfsense-4199bda9026c654d8438f5a7894b0e4c1857a5af.zip
pfsense-4199bda9026c654d8438f5a7894b0e4c1857a5af.tar.gz
remove pointless filter on dhcp static mappings table
-rw-r--r--usr/local/www/services_dhcp.php2
-rw-r--r--usr/local/www/status_dhcp_leases.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index 7b9cc20..ef56caa 100644
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -1379,7 +1379,6 @@ include("head.inc");
if (is_array($a_maps)):
$i = 0;
foreach ($a_maps as $mapent):
- 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;?>';">
@@ -1409,7 +1408,6 @@ include("head.inc");
</td>
</tr>
<?php
- endif;
$i++;
endforeach;
endif;
diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php
index 97ab938..7755dc5 100644
--- a/usr/local/www/status_dhcp_leases.php
+++ b/usr/local/www/status_dhcp_leases.php
@@ -357,7 +357,7 @@ if (count($pools) > 0) {
// 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>";
OpenPOWER on IntegriCloud