summaryrefslogtreecommitdiffstats
path: root/usr/local/www/wizard.php
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-10-25 11:19:29 +0000
committerErmal <eri@pfsense.org>2010-10-25 11:19:29 +0000
commit24b2aa62beafe22517dc34421b78001477703db7 (patch)
tree590bb7e1816c7cd12881a827567919ef69826819 /usr/local/www/wizard.php
parent6dbd2e745bcabbaad7d620b0f1b878f5e07ceaad (diff)
downloadpfsense-24b2aa62beafe22517dc34421b78001477703db7.zip
pfsense-24b2aa62beafe22517dc34421b78001477703db7.tar.gz
Resolves #971. Fix wizard.php to show interface descriptive names. Pointy-hat: gnhb
Diffstat (limited to 'usr/local/www/wizard.php')
-rwxr-xr-xusr/local/www/wizard.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 14a1802..9dc4d80 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -457,11 +457,11 @@ function showchange() {
else
$interfaces = get_configured_interface_with_descr();
foreach ($interfaces as $ifname => $iface) {
- if (is_array($iface)) {
- if ($iface['mac'])
- $iface = $ifname. " ({$iface['mac']})";
- } else
- $iface = $ifname;
+ if ($field['type'] == "interface_select") {
+ $iface = $ifname;
+ if ($iface['mac'])
+ $iface .= " ({$iface['mac']})";
+ }
$SELECTED = "";
if ($value == $ifname) $SELECTED = " SELECTED";
$to_echo = "<option value='" . $ifname . "'" . $SELECTED . ">" . $iface . "</option>\n";
@@ -470,13 +470,12 @@ function showchange() {
if($field['interface_filter'] <> "") {
if(stristr($ifname, $field['interface_filter']) == true)
$canecho = 1;
- } else {
+ } else
$canecho = 1;
- }
if($canecho == 1)
echo $to_echo;
}
- echo "</select>\n";
+ echo "</select>\n";
if($field['description'] <> "") {
echo "<br /> " . $field['description'];
OpenPOWER on IntegriCloud