diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-01-11 15:09:08 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-01-11 15:09:08 -0500 |
commit | e9ef9ba0d14ebd9cc00d1989da2bb82cc33d4184 (patch) | |
tree | 9e8644d38aa9c531dca610381f0e3fbefde6cdd8 /src/usr/local | |
parent | 875f6c8ba42b2e44851106122c41428af54acbd7 (diff) | |
download | pfsense-e9ef9ba0d14ebd9cc00d1989da2bb82cc33d4184.zip pfsense-e9ef9ba0d14ebd9cc00d1989da2bb82cc33d4184.tar.gz |
Fixed #5760
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/interfaces_bridge_edit.php | 12 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_groups_edit.php | 23 |
2 files changed, 8 insertions, 27 deletions
diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index 4997ef5..4a60f03 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -431,7 +431,7 @@ $section->addInput(new Form_Select( $edgelist = build_port_list($pconfig['edge']); $section->addInput(new Form_Select( - 'edge[]', + 'edge', 'Edge Ports', $edgelist['selected'], $edgelist['list'], @@ -441,7 +441,7 @@ $section->addInput(new Form_Select( $edgelist = build_port_list($pconfig['autoedge']); $section->addInput(new Form_Select( - 'autoedge[]', + 'autoedge', 'Auto Edge Ports', $edgelist['selected'], $edgelist['list'], @@ -462,7 +462,7 @@ $section->addInput(new Form_Select( $edgelist = build_port_list($pconfig['autoptp']); $section->addInput(new Form_Select( - 'autoptp[]', + 'autoptp', 'Auto PTP Ports', $edgelist['selected'], $edgelist['list'], @@ -473,7 +473,7 @@ $section->addInput(new Form_Select( $edgelist = build_port_list($pconfig['static']); $section->addInput(new Form_Select( - 'static[]', + 'static', 'Sticky Ports', $edgelist['selected'], $edgelist['list'], @@ -484,7 +484,7 @@ $section->addInput(new Form_Select( $edgelist = build_port_list($pconfig['private']); $section->addInput(new Form_Select( - 'private[]', + 'privateprivate', 'Private Ports', $edgelist['selected'], $edgelist['list'], @@ -520,7 +520,7 @@ $section->addInput(new Form_Select( $edgelist = build_port_list($pconfig['stp']); $section->addInput(new Form_Select( - 'stp[]', + 'stp', 'STP Interfaces', $edgelist['selected'], $edgelist['list'], diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index f7ef013..a121bcd 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -109,28 +109,9 @@ if ($_POST) { $input_errors[] = "The specified group name is already used by an interface. Please choose another name."; } } - $members = ""; - $isfirst = 0; - /* item is a normal ifgroupentry type */ - for ($x = 0; $x < 9999; $x++) { - if ($_POST["members{$x}"] <> "") { - if ($isfirst > 0) { - $members .= " "; - } - $members .= $_POST["members{$x}"]; - $isfirst++; - } - } if (isset($_POST['members'])) { - foreach ($_POST['members'] as $member) { - if ($isfirst > 0) { - $members .= " "; - } - - $members .= $member[0]; - $isfirst++; - } + $members = implode(" ", $_POST['members']); } else { $members = ""; } @@ -259,7 +240,7 @@ $section->addInput(new Form_Input( 'here for your reference (not parsed)'); $section->addInput(new Form_Select( - 'members[]', + 'members', 'Group Members', explode(' ', $pconfig['members']), $interface_list, |