diff options
author | Seth Mos <seth.mos@dds.nl> | 2011-03-15 09:59:39 +0100 |
---|---|---|
committer | Seth Mos <seth.mos@dds.nl> | 2011-03-15 09:59:39 +0100 |
commit | 1ae43bfa8536bfe67d62722edfe8256c34834219 (patch) | |
tree | 03684f7aa902b476e0fc8f476347eda0ab0a6600 /etc/inc/easyrule.inc | |
parent | d52a66f970d3620fcc515023235d356a0f2fffb9 (diff) | |
parent | 96f1a57a168fcca66d7c5079ff2b22f5ea444494 (diff) | |
download | pfsense-1ae43bfa8536bfe67d62722edfe8256c34834219.zip pfsense-1ae43bfa8536bfe67d62722edfe8256c34834219.tar.gz |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc/easyrule.inc')
-rw-r--r-- | etc/inc/easyrule.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc index 45d3f74..63be652 100644 --- a/etc/inc/easyrule.inc +++ b/etc/inc/easyrule.inc @@ -79,11 +79,12 @@ function easyrule_block_rule_exists($int = 'wan') { } /* Search through the rules for one referencing our alias */ - foreach ($config['filter']['rule'] as $rule) + foreach ($config['filter']['rule'] as $rule) { if (!is_array($rule) || !is_array($rule['source'])) continue; if ($rule['source']['address'] == $blockaliasname . strtoupper($int) && ($rule['interface'] == $int)) return true; + } return false; } @@ -114,7 +115,7 @@ function easyrule_block_rule_create($int = 'wan') { $filterent['destination']['any'] = ''; $filterent['descr'] = "Easy Rule: Blocked from Firewall Log View"; - $a_filter[] = $filterent; + array_splice($a_filter, 0, 0, array($filterent)); return true; } |