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

Make display of interface name and uptime work again on status_interfaces.php

Browse Source
This commit is contained in:
gnhb 2010-06-06 19:52:28 +07:00
parent cac14686eb
commit ebdbdbc26b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/inc/pfsense-utils.inc
View File

@ -1171,7 +1171,7 @@ function get_interface_info($ifdescr) {
$ifinfo = array();
if (empty($config['interfaces'][$ifdescr]))
return;
$ifinfo['hwif'] = $config['interfaces'][$if]['if'];
$ifinfo['hwif'] = $config['interfaces'][$ifdescr]['if'];
$ifinfo['if'] = get_real_interface($ifdescr);
$chkif = $ifinfo['if'];
@ -1264,16 +1264,16 @@ function get_interface_info($ifdescr) {
if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) {
foreach ($config['ppps']['ppp'] as $pppid => $ppp) {
if ($config['interfaces'][$if]['ptpid'] == $ppp['ptpid'])
if ($config['interfaces'][$ifdescr]['ptpid'] == $ppp['ptpid'])
break;
}
}
$dev = $ppp['ports'];
if ($config['interfaces'][$if]['ptpid'] != $ppp['ptpid'] || empty($dev))
if ($config['interfaces'][$ifdescr]['ptpid'] != $ppp['ptpid'] || empty($dev))
break;
if (file_exists($dev)) {
if (file_exists("{$g['varrun_path']}/ppp_{$if}.pid")) {
$ifinfo['pppinfo'] = "{$ifinfo['if']}";
if (file_exists("{$g['varrun_path']}/ppp_{$ifdescr}.pid")) {
$ifinfo['pppinfo'] = $ifinfo['if'];
$sec = trim(`/usr/local/sbin/ppp-uptime.sh {$ifinfo['if']}`);
$ifinfo['ppp_uptime'] = convert_seconds_to_hms($sec);
}
@ -1341,8 +1341,8 @@ function get_interface_info($ifdescr) {
}
/* lookup the gateway */
if (interface_has_gateway($if))
$ifinfo['gateway'] = get_interface_gateway($if);
if (interface_has_gateway($ifdescr))
$ifinfo['gateway'] = get_interface_gateway($ifdescr);
}
$bridge = "";

4
usr/local/www/status_interfaces.php
View File

@ -76,9 +76,7 @@ include("head.inc");
<?php endif; ?>
<tr>
<td colspan="2" class="listtopic">
<?=htmlspecialchars($ifname);?>
interface
(<?=($ifinfo['hwif']);?>)
<?=htmlspecialchars($ifname);?> interface (<?=htmlspecialchars($ifinfo['hwif']);?>)
</td>
</tr>
<tr>