diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-03-10 19:39:39 -0700 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-03-10 19:39:39 -0700 |
| commit | c805e0f35bc5030fdacb0d339649e72b2947009f (patch) | |
| tree | cf4694de335e63d35f959d262340551c5996c1c5 | |
| parent | 11e4dcc72f235368eb827e040413e70e86014602 (diff) | |
| download | pfsense-c805e0f35bc5030fdacb0d339649e72b2947009f.zip pfsense-c805e0f35bc5030fdacb0d339649e72b2947009f.tar.gz | |
Make Firewall Rules Advanced Options open if used - 2.1 branch
This is the same code as pull request 997 but for 2.1 branch
| -rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 24788d9..d77fe23 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -45,6 +45,23 @@ require("guiconfig.inc"); require_once("filter.inc"); require("shaper.inc"); +function is_aoadv_used($rule_config) { + // Note that the user could set "tag" or "tagged" to the string "0", which is valid but empty(). + if ((isset($rule_config['allowopts'])) || + (isset($rule_config['disablereplyto'])) || + ($rule_config['tag'] != "") || + ($rule_config['tagged'] != "") || + (!empty($rule_config['max'])) || + (!empty($rule_config['max-src-nodes'])) || + (!empty($rule_config['max-src-conn'])) || + (!empty($rule_config['max-src-states'])) || + (!empty($rule_config['max-src-conn-rate'])) || + (!empty($rule_config['max-src-conn-rates'])) || + (!empty($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) { @@ -1230,10 +1247,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> |
