summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Boyce <me@willboyce.com>2015-05-30 10:59:42 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-05-30 10:59:42 -0300
commit139ca5491b8ad36ff65d902f0bde2b1ea106477d (patch)
treeed0ec580e8fb099bb7d138dd427932a0f5501344
parent927eecf3e31eea8ce431317664ab78e8bea524da (diff)
downloadpfsense-139ca5491b8ad36ff65d902f0bde2b1ea106477d.zip
pfsense-139ca5491b8ad36ff65d902f0bde2b1ea106477d.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 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>";
OpenPOWER on IntegriCloud