summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2009-05-03 14:37:12 -0400
committerChris Buechler <cmb@pfsense.org>2009-05-03 14:37:12 -0400
commit30705af78e63d4566e9f32623d45bbedb762abc4 (patch)
treec900da7e6f76b8e5c61a20136133a744a0dab42f /usr/local/www
parent28409753266f69c94ed08dcbfe41cd3170ee80bb (diff)
downloadpfsense-30705af78e63d4566e9f32623d45bbedb762abc4.zip
pfsense-30705af78e63d4566e9f32623d45bbedb762abc4.tar.gz
merge fix from jim-p for ticket #1921
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/diag_dhcp_leases.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index 4f72865..777da4a 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -237,9 +237,8 @@ foreach($config['interfaces'] as $ifname => $ifarr) {
$slease['ip'] = $static['ipaddr'];
$slease['type'] = "static";
$slease['mac'] = $static['mac'];
- $slease['start'] = gmdate("M d Y H:i:s", time());
- $slease['end'] = gmdate("M d Y H:i:s", time());
- $slease['end'] = gmdate("M d Y H:i:s", strtotime('+5 minutes'));
+ $slease['start'] = "";
+ $slease['end'] = "";
$slease['hostname'] = htmlentities($static['hostname']);
$slease['act'] = "static";
$online = exec("/usr/sbin/arp -an |/usr/bin/grep {$slease['mac']}| /usr/bin/wc -l|/usr/bin/awk '{print $1;}'");
@@ -343,8 +342,13 @@ foreach ($leases as $data) {
echo "<td class=\"listr\">{$fspans}{$data['mac']}{$fspane}&nbsp;</td>\n";
}
echo "<td class=\"listr\">{$fspans}" . htmlentities($data['hostname']) . "{$fspane}&nbsp;</td>\n";
- echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['start']) . "{$fspane}&nbsp;</td>\n";
- echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['end']) . "{$fspane}&nbsp;</td>\n";
+ if ($data['type'] != "static") {
+ echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['start']) . "{$fspane}&nbsp;</td>\n";
+ echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['end']) . "{$fspane}&nbsp;</td>\n";
+ } else {
+ echo "<td class=\"listr\">{$fspans} n/a {$fspane}&nbsp;</td>\n";
+ echo "<td class=\"listr\">{$fspans} n/a {$fspane}&nbsp;</td>\n";
+ }
echo "<td class=\"listr\">{$fspans}{$data['online']}{$fspane}&nbsp;</td>\n";
echo "<td class=\"listr\">{$fspans}{$data['act']}{$fspane}&nbsp;</td>\n";
OpenPOWER on IntegriCloud