diff options
| author | jim-p <jim@pingle.org> | 2009-05-03 13:55:11 -0400 |
|---|---|---|
| committer | jim-p <jim@pingle.org> | 2009-05-03 13:55:11 -0400 |
| commit | aedd7929dc40d49bd631cd0dc8c88d6ee96e911e (patch) | |
| tree | afe72870948c679d7c2a30c2ab4cecfea09870e1 | |
| parent | 29e9dc64cfa2807d4c21b64c7a27802820f29dd4 (diff) | |
| download | pfsense-aedd7929dc40d49bd631cd0dc8c88d6ee96e911e.zip pfsense-aedd7929dc40d49bd631cd0dc8c88d6ee96e911e.tar.gz | |
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.
| -rwxr-xr-x | usr/local/www/diag_dhcp_leases.php | 14 |
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 17b27e0..21a4f70 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -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} </td>\n"; } echo "<td class=\"listr\">{$fspans}" . htmlentities($data['hostname']) . "{$fspane} </td>\n"; - echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['start']) . "{$fspane} </td>\n"; - echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['end']) . "{$fspane} </td>\n"; + if ($data['type'] != "static") { + echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['start']) . "{$fspane} </td>\n"; + echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['end']) . "{$fspane} </td>\n"; + } else { + echo "<td class=\"listr\">{$fspans} n/a {$fspane} </td>\n"; + echo "<td class=\"listr\">{$fspans} n/a {$fspane} </td>\n"; + } echo "<td class=\"listr\">{$fspans}{$data['online']}{$fspane} </td>\n"; echo "<td class=\"listr\">{$fspans}{$data['act']}{$fspane} </td>\n"; |
