diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-03-10 08:03:32 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-03-10 08:03:32 -0500 |
commit | 0c35ea41cadd8eda9463df69b861af1461b82af7 (patch) | |
tree | e64d8e90a851c67296b6a48e87a9d417e7146f4b /src/usr | |
parent | 83a1c6d7ed36645f1612a13856c986aa8dc98419 (diff) | |
parent | f7e3a67f58cca66642fe7c405d4a059064e77504 (diff) | |
download | pfsense-0c35ea41cadd8eda9463df69b861af1461b82af7.zip pfsense-0c35ea41cadd8eda9463df69b861af1461b82af7.tar.gz |
Merge pull request #2721 from phil-davis/patch-2
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index c7675ef..3dd4bfa 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -82,7 +82,9 @@ function is_posnumericint($arg) { function is_aoadv_used($rule_config) { // Note that the user could set "tag" or "tagged" to the string "0", which is valid but empty(). // And if the user enters "0" in other fields, we want to present an error message, and keep the Advanced Options section open. - if ((isset($rule_config['allowopts'])) || + if (($rule_config['os'] != "") || + ($rule_config['dscp'] != "") || + (isset($rule_config['allowopts'])) || (isset($rule_config['disablereplyto'])) || ($rule_config['tag'] != "") || ($rule_config['tagged'] != "") || @@ -92,7 +94,21 @@ function is_aoadv_used($rule_config) { ($rule_config['max-src-states'] != "") || ($rule_config['max-src-conn-rate'] != "") || ($rule_config['max-src-conn-rates'] != "") || - ($rule_config['statetimeout'] != "")) { + ($rule_config['statetimeout'] != "") || + ($rule_config['tcpflags1'] != "") || + ($rule_config['tcpflags2'] != "") || + ($rule_config['tcpflags_any']) || + ($rule_config['nopfsync']) || + (($rule_config['statetype'] != "") && ($rule_config['statetype'] != "keep state")) || + ($rule_config['nosync']) || + ($rule_config['vlanprio'] != "") || + ($rule_config['vlanprioset'] != "") || + ($rule_config['sched'] != "") || + ($rule_config['gateway'] != "") || + ($rule_config['dnpipe'] != "") || + ($rule_config['pdnpipe'] != "") || + ($rule_config['ackqueue'] != "") || + ($rule_config['defaultqueue'] != "")) { return true; } |