diff options
| author | Jim P <jim@pingle.org> | 2012-12-05 09:25:40 -0800 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2012-12-05 09:25:40 -0800 |
| commit | 7c59bcc2473c58c3e6ec1769e63e04403ed8e10a (patch) | |
| tree | b9e0515ebe987ccf0657f2b2284ef24862bf3481 /etc | |
| parent | e670244759cb73a5d9386b3b7c42e706e1a6d90c (diff) | |
| parent | 669332bd0afc8d76f83c4d171f04eb6c33fe77f6 (diff) | |
| download | pfsense-7c59bcc2473c58c3e6ec1769e63e04403ed8e10a.zip pfsense-7c59bcc2473c58c3e6ec1769e63e04403ed8e10a.tar.gz | |
Merge pull request #262 from PiBa-NL/cleanup
code formatting, and extra newline for message and rule generation
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index bfd5b17..6e0da37 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2021,8 +2021,9 @@ function filter_generate_user_rule($rule) { } else $aline['interface'] = ""; } else if(!array_key_exists($rule['interface'], $FilterIflist)) { - foreach($FilterIflist as $oc) $item .= $oc['descr']; - return "# {$item} {$rule['interface']} array key does not exist for " . $rule['descr']; + foreach($FilterIflist as $oc) + $items .= $oc['descr'] . " "; + return "# array key \"{$rule['interface']}\" does not exist for \"" . $rule['descr'] . "\" in array: {{$items}}"; } else if((array_key_exists($rule['interface'], $FilterIflist)) && (is_array($FilterIflist[$rule['interface']])) && (is_array($FilterIflist[$rule['interface']][0]))) { @@ -2426,6 +2427,7 @@ EOD; block quick from <snort2c> to any label "Block snort2c hosts" block quick from any to <snort2c> label "Block snort2c hosts" + EOD; $ipfrules .= filter_process_carp_rules($log); |
