summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/interfaces_bridge_edit.php
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-02-17 00:06:50 -0600
committerChris Buechler <cmb@pfsense.org>2016-02-17 00:06:50 -0600
commita59340e14e9b47cd8974dc646853031bfe749e35 (patch)
treed3c001322ecef238b669a1247cbf70fb552ccf36 /src/usr/local/www/interfaces_bridge_edit.php
parent45326c4b2e4987c6bcdb117ea56534c8a5568982 (diff)
downloadpfsense-a59340e14e9b47cd8974dc646853031bfe749e35.zip
pfsense-a59340e14e9b47cd8974dc646853031bfe749e35.tar.gz
Expand advanced where advanced options are configured. Ticket #5900
Diffstat (limited to 'src/usr/local/www/interfaces_bridge_edit.php')
-rw-r--r--src/usr/local/www/interfaces_bridge_edit.php16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php
index df8e89b..7551c66 100644
--- a/src/usr/local/www/interfaces_bridge_edit.php
+++ b/src/usr/local/www/interfaces_bridge_edit.php
@@ -66,6 +66,14 @@ if (!is_array($config['bridges']['bridged'])) {
$config['bridges']['bridged'] = array();
}
+function is_aoadv_used($pconfig) {
+ if (isset($pconfig['static']) || isset($pconfig['private']) || isset($pconfig['stp']) || isset($pconfig['span']) || isset($pconfig['edge']) || isset($pconfig['autoedge']) || isset($pconfig['ptp']) || isset($pconfig['autoptp']) || isset($pconfig['maxaddr']) || isset($pconfig['timeout']) || isset($pconfig['maxage']) || isset($pconfig['fwdelay']) || isset($pconfig['hellotime']) || isset($pconfig['priority']) || isset($pconfig['proto']) || isset($pconfig['holdcnt'])) {
+ return true;
+ }
+
+ return false;
+}
+
$a_bridges = &$config['bridges']['bridged'];
$ifacelist = get_configured_interface_with_descr();
@@ -421,11 +429,13 @@ $section->addInput(new Form_Input(
$pconfig['descr']
));
+$showadvanced = is_aoadv_used($pconfig);
+
$section->addInput(new Form_Checkbox(
'showadvanced',
'Advanced',
'Show advanced options',
- $pconfig['showadvanced']
+ $showadvanced
))->toggles('.toggle-advanced');
$form->add($section);
@@ -433,7 +443,7 @@ $form->add($section);
$section = new Form_Section('Advanced Configuration');
// Set initial toggle state manually for now
-if ($pconfig['showadvanced']) {
+if ($showadvanced) {
$section->addClass('toggle-advanced in');
} else {
$section->addClass('toggle-advanced collapse');
@@ -540,7 +550,7 @@ $section->addInput(new Form_Checkbox(
// Show the spanning tree section
$form->add($section);
$section = new Form_Section('RSTP/STP');
-if ($pconfig['showadvanced']) {
+if ($showadvanced) {
$section->addClass('toggle-advanced in');
} else {
$section->addClass('toggle-advanced collapse');
OpenPOWER on IntegriCloud