lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter: direction 'any' wasn't respected in floating rule

Browse Source
This commit is contained in:
Franco Fichtner 2017-02-02 17:49:48 +01:00
parent cdedd9a553
commit 895e30d1bf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/etc/inc/filter.inc
View File

@ -2297,11 +2297,15 @@ function filter_generate_user_rule(&$FilterIflist, $rule)
} else {
$aline['type'] = $type . " ";
}
if (isset($rule['floating']) && $rule['floating'] == "yes" && $rule['direction'] != "any") {
$aline['direction'] = " " . $rule['direction'] . " ";
if (isset($rule['floating']) && $rule['floating'] == 'yes') {
if ($rule['direction'] != 'any') {
$aline['direction'] = " {$rule['direction']} ";
} elseif ($$rule['direction'] == 'any') {
$aline['direction'] = '';
}
} else {
/* ensure the direction is in */
$aline['direction'] = " in ";
/* ensure the direction is 'in' */
$aline['direction'] = ' in ';
}
if (isset($rule['log'])) {
$aline['log'] = "log ";