diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/diag_logs_settings.php | 8 | ||||
| -rw-r--r-- | usr/local/www/diag_ping.php | 8 | ||||
| -rw-r--r-- | usr/local/www/diag_testport.php | 8 | ||||
| -rw-r--r-- | usr/local/www/diag_traceroute.php | 8 | ||||
| -rw-r--r-- | usr/local/www/status_dhcp_leases.php | 22 |
5 files changed, 32 insertions, 22 deletions
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index e2eca1a..5f48985 100644 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -380,13 +380,13 @@ function check_everything() { <select name="sourceip" class="formselect"> <option value="">Default (any)</option> <?php $sourceips = get_possible_traffic_source_addresses(false); - foreach ($sourceips as $sip): + foreach ($sourceips as $sipvalue => $sipname): $selected = ""; - if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $pconfig['sourceip'])) + if (!link_interface_to_bridge($sipvalue) && ($sipvalue == $pconfig['sourceip'])) $selected = 'selected="selected"'; ?> - <option value="<?=$sip['value'];?>" <?=$selected;?>> - <?=htmlspecialchars($sip['name']);?> + <option value="<?=$sipvalue;?>" <?=$selected;?>> + <?=htmlspecialchars($sipname);?> </option> <?php endforeach; ?> </select> diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index bc60f71..0c289cf 100644 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -116,13 +116,13 @@ include("head.inc"); ?> <select name="sourceip" class="formselect"> <option value="">Default</option> <?php $sourceips = get_possible_traffic_source_addresses(true); - foreach ($sourceips as $sip): + foreach ($sourceips as $sipvalue => $sipname): $selected = ""; - if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip)) + if (!link_interface_to_bridge($sipvalue) && ($sipvalue == $sourceip)) $selected = "selected=\"selected\""; ?> - <option value="<?=$sip['value'];?>" <?=$selected;?>> - <?=htmlspecialchars($sip['name']);?> + <option value="<?=$sipvalue;?>" <?=$selected;?>> + <?=htmlspecialchars($sipname);?> </option> <?php endforeach; ?> </select> diff --git a/usr/local/www/diag_testport.php b/usr/local/www/diag_testport.php index b64075e..393c757 100644 --- a/usr/local/www/diag_testport.php +++ b/usr/local/www/diag_testport.php @@ -140,13 +140,13 @@ include("head.inc"); ?> <select name="sourceip" class="formselect"> <option value="">Any</option> <?php $sourceips = get_possible_traffic_source_addresses(true); - foreach ($sourceips as $sip): + foreach ($sourceips as $sipvalue => $sipname): $selected = ""; - if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip)) + if (!link_interface_to_bridge($sipvalue) && ($sipvalue == $sourceip)) $selected = "selected=\"selected\""; ?> - <option value="<?=$sip['value'];?>" <?=$selected;?>> - <?=htmlspecialchars($sip['name']);?> + <option value="<?=$sipvalue;?>" <?=$selected;?>> + <?=htmlspecialchars($sipname);?> </option> <?php endforeach; ?> </select> diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index 8cdbf93..7878ebe 100644 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -116,13 +116,13 @@ if (!isset($do_traceroute)) { <select name="sourceip" class="formselect"> <option value="">Any</option> <?php $sourceips = get_possible_traffic_source_addresses(true); - foreach ($sourceips as $sip): + foreach ($sourceips as $sipvalue => $sipname): $selected = ""; - if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip)) + if (!link_interface_to_bridge($sipvalue) && ($sipvalue == $sourceip)) $selected = "selected=\"selected\""; ?> - <option value="<?=$sip['value'];?>" <?=$selected;?>> - <?=htmlspecialchars($sip['name']);?> + <option value="<?=$sipvalue;?>" <?=$selected;?>> + <?=htmlspecialchars($sipname);?> </option> <?php endforeach; ?> </select> diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php index 191d9f5..24c41b8 100644 --- a/usr/local/www/status_dhcp_leases.php +++ b/usr/local/www/status_dhcp_leases.php @@ -107,9 +107,12 @@ function adjust_gmt($dt) { } if ($dhcpleaseinlocaltime == "yes") { $ts = strtotime($dt . " GMT"); - return strftime("%Y/%m/%d %I:%M:%S%p", $ts); - } else - return $dt; + if ($ts !== false) { + return strftime("%Y/%m/%d %I:%M:%S%p", $ts); + } + } + /* If we did not need to convert to local time or the conversion failed, just return the input. */ + return $dt; } function remove_duplicate($array, $field) @@ -186,9 +189,16 @@ foreach($leases_content as $lease) { $f = $f+3; break; case "ends": - $leases[$l]['end'] = $data[$f+2]; - $leases[$l]['end'] .= " " . $data[$f+3]; - $f = $f+3; + if ($data[$f+1] == "never") { + // Quote from dhcpd.leases(5) man page: + // If a lease will never expire, date is never instead of an actual date. + $leases[$l]['end'] = gettext("Never"); + $f = $f+1; + } else { + $leases[$l]['end'] = $data[$f+2]; + $leases[$l]['end'] .= " " . $data[$f+3]; + $f = $f+3; + } break; case "tstp": $f = $f+3; |
