mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't display a fake time for a static DHCP lease begin/end. Since it has no beginning and ending, just display "n/a" instead. See ticket #1921.

Browse Source
This commit is contained in:
jim-p 2009-05-03 13:55:11 -04:00
parent 29e9dc64cf
commit aedd7929dc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr/local/www/diag_dhcp_leases.php
View File

@ -254,9 +254,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;}'");
@ -360,8 +359,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";