diff options
| author | Renato Botelho <garga@pfSense.org> | 2014-03-07 07:20:33 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2014-03-07 07:20:33 -0300 |
| commit | 3f9586b659aacfef34b73a5aa05c882d40314d69 (patch) | |
| tree | a9969a9a2160ca405d84165989510aaa88cf4959 /usr/local/www/firewall_rules_edit.php | |
| parent | fe3553d16de7360c4832ad6d6938c545bde523ff (diff) | |
| parent | fd8398420ddad40343a6b96273467e72943d7674 (diff) | |
| download | pfsense-3f9586b659aacfef34b73a5aa05c882d40314d69.zip pfsense-3f9586b659aacfef34b73a5aa05c882d40314d69.tar.gz | |
Merge pull request #997 from phil-davis/master
Make Firewall Rules Advanced Options open if used
Diffstat (limited to 'usr/local/www/firewall_rules_edit.php')
| -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 f2c3479..4d336cb 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) { @@ -1240,10 +1257,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> |
