diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-03-04 21:29:33 -0800 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-03-04 21:29:33 -0800 |
| commit | bd9d6e0e354b6f753ac8f08b96598c5f203bf858 (patch) | |
| tree | 8583da281877d41c1f053dc09d6f7cfaf0c8b515 | |
| parent | 088a4eed18e192c7577ce79406fc914a9b4a708a (diff) | |
| download | pfsense-bd9d6e0e354b6f753ac8f08b96598c5f203bf858.zip pfsense-bd9d6e0e354b6f753ac8f08b96598c5f203bf858.tar.gz | |
Make Firewall Rules Advanced Options open if used
Currently, if there are some settings defined in Firewall Rules Edit, Advanced Features, Advanced Options, the Advanced Options section is left minimized when the Firewall Edit screen is displayed. This makes it easy for a user to not notice that there are some Advanced Options settings.
This change makes the Advanced Options section be displayed if any of the settings are defined, in the same way it is done for all the other Advanced Features sections.
| -rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 9020ac0..7bbd8e9 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -45,6 +45,22 @@ require("guiconfig.inc"); require_once("filter.inc"); require("shaper.inc"); +function is_aoadv_used($rule_config) { + if (($rule_config['allowopts']) || + ($rule_config['disablereplyto']) || + ($rule_config['tag'] != "") || + ($rule_config['tagged'] != "") || + ($rule_config['max'] != "") || + ($rule_config['max-src-nodes'] != "") || + ($rule_config['max-src-conn'] != "") || + ($rule_config['max-src-states'] != "") || + ($rule_config['max-src-conn-rate'] != "") || + ($rule_config['max-src-conn-rates'] != "") || + ($rule_config['statetimeout'] != "")) + return true; + return false; +} + $specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn"); $ifdisp = get_configured_interface_with_descr(); foreach ($ifdisp as $kif => $kdescr) { @@ -1240,10 +1256,10 @@ $i--): ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Advanced Options");?></td> <td width="78%" class="vtable"> - <div id="aoadv"> + <div id="aoadv" <?php if (is_aoadv_used($pconfig)) echo "style='display:none'"; ?>> <input type="button" onclick="show_aodiv();" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?> </div> - <div id="aodivmain" style="display:none"> + <div id="aodivmain" <?php if (!is_aoadv_used($pconfig)) echo "style='display:none'"; ?>> <input type="checkbox" id="allowopts" value="yes" name="allowopts"<?php if($pconfig['allowopts'] == true) echo " checked=\"checked\""; ?> /> <br/><span class="vexpl"><?=gettext("This allows packets with IP options to pass. Otherwise they are blocked by default. This is usually only seen with multicast traffic.");?> </span><p> |
