diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-06-30 10:47:11 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-06-30 10:47:11 -0300 |
commit | 939f4e39278d8acc1709bae76f51ec6551091fec (patch) | |
tree | 379f2cf8f94159dc4fb427fb2fbca30c044668e5 /usr | |
parent | 0ffc4a7bc1c85db3f450aba1c12ed808a94411bc (diff) | |
download | pfsense-939f4e39278d8acc1709bae76f51ec6551091fec.zip pfsense-939f4e39278d8acc1709bae76f51ec6551091fec.tar.gz |
Fix #3725:
- Fix match_filter_field() and also simplify logic
- Fix $filterfieldsarray initialization
- Avoid to have double spaces on filterfieldsarray['act']
- Fix filter on Firewall Logs
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/diag_logs_filter.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 13d72bd..d12ad43 100644 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -87,14 +87,14 @@ if ($filtersubmit) { $filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null); if ($filterlogentries_submit) { - $filterfieldsarray = array("act", "time", "interface", "srcip", "srcport", "dstip", "dstport", "proto", "tcpflags"); + $filterfieldsarray = array(); $actpass = getGETPOSTsettingvalue('actpass', null); $actblock = getGETPOSTsettingvalue('actblock', null); $actreject = getGETPOSTsettingvalue('actreject', null); - $filterfieldsarray['act'] = trim($actpass . " " . $actblock . " " . $actreject); - $filterfieldsarray['act'] = $filterfieldsarray['act'] ? $filterfieldsarray['act'] : 'All'; + $filterfieldsarray['act'] = str_replace(" ", " ", trim($actpass . " " . $actblock . " " . $actreject)); + $filterfieldsarray['act'] = $filterfieldsarray['act'] != "" ? $filterfieldsarray['act'] : 'All'; $filterfieldsarray['time'] = getGETPOSTsettingvalue('filterlogentries_time', null); $filterfieldsarray['interface'] = getGETPOSTsettingvalue('filterlogentries_interfaces', null); $filterfieldsarray['srcip'] = getGETPOSTsettingvalue('filterlogentries_sourceipaddress', null); |