diff options
author | Bill Marquette <bill.marquette@gmail.com> | 2011-05-14 17:44:40 -0500 |
---|---|---|
committer | Bill Marquette <bill.marquette@gmail.com> | 2011-05-14 17:44:40 -0500 |
commit | 325e316391adaaf2968aadd385c3b8d3ed08569b (patch) | |
tree | d65b96d96f6383f9a1ed090b3df79649a84da47a /usr/local/www/status_interfaces.php | |
parent | 3f9492a77093865d4fdebfa76d6a7fdd6161f129 (diff) | |
parent | 4450527f90d05a6d267ed376e968935ed99382e8 (diff) | |
download | pfsense-325e316391adaaf2968aadd385c3b8d3ed08569b.zip pfsense-325e316391adaaf2968aadd385c3b8d3ed08569b.tar.gz |
Merge branch 'master' into smos-ipv6
Conflicts:
etc/inc/pfsense-utils.inc
Diffstat (limited to 'usr/local/www/status_interfaces.php')
-rwxr-xr-x | usr/local/www/status_interfaces.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index 5d7f80b..32dcbae 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -68,6 +68,8 @@ include("head.inc"); $ifdescrs = get_configured_interface_with_descr(false, true); foreach ($ifdescrs as $ifdescr => $ifname): $ifinfo = get_interface_info($ifdescr); + // Load MAC-Manufacturer table + $mac_man = load_mac_manufacturer_table(); ?> <?php if ($i): ?> <tr> @@ -175,7 +177,12 @@ include("head.inc"); <tr> <td width="22%" class="vncellt"><?=gettext("MAC address");?></td> <td width="78%" class="listr"> - <?=htmlspecialchars($ifinfo['macaddr']);?> + <?php + $mac=$ifinfo['macaddr']; + $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); + if(isset($mac_man[$mac_hi])){ print "<span title=\"$mac\">" . htmlspecialchars($mac_man[$mac_hi]); print "</span>"; } + else {print htmlspecialchars($mac);} + ?> </td> </tr> <?php endif; if ($ifinfo['status'] != "down"): ?> |