diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:59:34 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:59:34 -0300 |
commit | 270f81d9607be5f372a4bb89bbb53dd1e45a1f82 (patch) | |
tree | b9511afa10dfd1b311606a74af707f000b50e9e4 /usr/local/www/firewall_aliases.php | |
parent | 416686be4caf89487f98f6bade2c6a72887e9157 (diff) | |
parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
download | pfsense-270f81d9607be5f372a4bb89bbb53dd1e45a1f82.zip pfsense-270f81d9607be5f372a4bb89bbb53dd1e45a1f82.tar.gz |
Merge remote branch 'mainline/master' into 2_firewall
Conflicts:
usr/local/www/diag_nanobsd.php
usr/local/www/diag_packet_capture.php
usr/local/www/firewall_shaper.php
Diffstat (limited to 'usr/local/www/firewall_aliases.php')
-rwxr-xr-x | usr/local/www/firewall_aliases.php | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index c06f6fa..8bcfcf6 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -87,26 +87,29 @@ if ($_GET['act'] == "del") { if($is_alias_referenced == false) { if(is_array($config['filter']['rule'])) { foreach($config['filter']['rule'] as $rule) { - if($rule['source']['address'] && $rule['source']['address'] == $alias_name) { - $is_alias_referenced = true; - $referenced_by = $rule['descr']; - break; - } - if($rule['source']['port'] && $rule['source']['port'] == $alias_name) { - $is_alias_referenced = true; - $referenced_by = $rule['descr']; - break; - } - if($rule['destination']['address'] && $rule['destination']['address'] == $alias_name) { - $is_alias_referenced = true; - $referenced_by = $rule['descr']; - break; - } - if($rule['destination']['port'] && $rule['destination']['port'] == $alias_name) { - $is_alias_referenced = true; - $referenced_by = $rule['descr']; - break; + if($rule['source']) { + if($rule['source']['address'] && $rule['source']['address'] == $alias_name) { + $is_alias_referenced = true; + $referenced_by = $rule['descr']; + break; + } + if($rule['source']['port'] && $rule['source']['port'] == $alias_name) { + $is_alias_referenced = true; + $referenced_by = $rule['descr']; + break; + } + if($rule['destination']['address'] && $rule['destination']['address'] == $alias_name) { + $is_alias_referenced = true; + $referenced_by = $rule['descr']; + break; + } } + if($rule['destination']) + if($rule['destination']['port'] && $rule['destination']['port'] == $alias_name) { + $is_alias_referenced = true; + $referenced_by = $rule['descr']; + break; + } } } } |