Projet

Général

Profil

« Précédent | Suivant » 

Révision 939f4e39

Ajouté par Renato Botelho il y a presque 10 ans

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

Voir les différences:

usr/local/www/diag_logs_filter.php
87 87

  
88 88
$filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null);
89 89
if ($filterlogentries_submit) {
90
	$filterfieldsarray = array("act", "time", "interface", "srcip", "srcport", "dstip", "dstport", "proto", "tcpflags");
90
	$filterfieldsarray = array();
91 91

  
92 92
	$actpass = getGETPOSTsettingvalue('actpass', null);
93 93
	$actblock = getGETPOSTsettingvalue('actblock', null);
94 94
	$actreject = getGETPOSTsettingvalue('actreject', null);
95 95

  
96
	$filterfieldsarray['act'] = trim($actpass . " " . $actblock . " " . $actreject);
97
	$filterfieldsarray['act'] = $filterfieldsarray['act'] ? $filterfieldsarray['act'] : 'All';
96
	$filterfieldsarray['act'] = str_replace("  ", " ", trim($actpass . " " . $actblock . " " . $actreject));
97
	$filterfieldsarray['act'] = $filterfieldsarray['act'] != "" ? $filterfieldsarray['act'] : 'All';
98 98
	$filterfieldsarray['time'] = getGETPOSTsettingvalue('filterlogentries_time', null);
99 99
	$filterfieldsarray['interface'] = getGETPOSTsettingvalue('filterlogentries_interfaces', null);
100 100
	$filterfieldsarray['srcip'] = getGETPOSTsettingvalue('filterlogentries_sourceipaddress', null);

Formats disponibles : Unified diff