diff options
| author | jim-p <jimp@pfsense.org> | 2014-05-06 14:58:56 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-05-06 15:00:28 -0400 |
| commit | 481b97b0abcb438dfa480806e53db8862946d90e (patch) | |
| tree | 0a9c27dcc1f048d4cabe845333dba8eee3837bc7 /usr/local/www/diag_logs_filter.php | |
| parent | 4320083f3191d6a6f9359494fe279a1c521b79d1 (diff) | |
| download | pfsense-481b97b0abcb438dfa480806e53db8862946d90e.zip pfsense-481b97b0abcb438dfa480806e53db8862946d90e.tar.gz | |
Consider tracker IDs when looking up filter log entries, if present
Diffstat (limited to 'usr/local/www/diag_logs_filter.php')
| -rw-r--r-- | usr/local/www/diag_logs_filter.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 5f21504..f68d4b4 100644 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -72,8 +72,8 @@ function getGETPOSTsettingvalue($settingname, $default) $rulenum = getGETPOSTsettingvalue('getrulenum', null); if($rulenum) { - list($rulenum, $type) = explode(',', $rulenum); - $rule = find_rule_by_number($rulenum, $type); + list($rulenum, $tracker, $type) = explode(',', $rulenum); + $rule = find_rule_by_number($rulenum, $tracker, $type); echo gettext("The rule that triggered this action is") . ":\n\n{$rule}"; exit; } @@ -341,8 +341,8 @@ include("head.inc"); <tr class="<?=$evenRowClass?>"> <td class="listMRlr nowrap" align="center" sorttable_customkey="<?=$filterent['act']?>"> <center> - <a onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?php echo "{$filterent['rulenum']},{$filterent['act']}"; ?>', outputrule);"> - <img border="0" src="<?php echo find_action_image($filterent['act']);?>" width="11" height="11" align="middle" alt="<?php echo $filterent['act'];?>" title="<?php echo $filterent['act'];?>" /> + <a onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?php echo "{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"> + <img border="0" src="<?php echo find_action_image($filterent['act']);?>" width="11" height="11" align="middle" alt="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" /> <?php if ($filterent['count']) echo $filterent['count'];?></a></center></td> <td class="listMRr" nowrap="nowrap"><?php echo htmlspecialchars($filterent['time']);?></td> <td class="listMRr" nowrap="nowrap"> @@ -352,7 +352,7 @@ include("head.inc"); <?php echo htmlspecialchars($filterent['interface']);?></td> <?php if ($config['syslog']['filterdescriptions'] === "1") - echo("<td class=\"listMRr nowrap\">".find_rule_by_number_buffer($filterent['rulenum'],$filterent['act'])."</td>"); + echo("<td class=\"listMRr nowrap\">".find_rule_by_number_buffer($filterent['rulenum'],$filterent['tracker'],$filterent['act'])."</td>"); $int = strtolower($filterent['interface']); $proto = strtolower($filterent['proto']); @@ -390,7 +390,7 @@ include("head.inc"); <?php if (isset($config['syslog']['filterdescriptions']) && $config['syslog']['filterdescriptions'] === "2"):?> <tr class="<?=$evenRowClass?>"> <td colspan="2" class="listMRDescriptionL listMRlr" /> - <td colspan="4" class="listMRDescriptionR listMRr nowrap"><?=find_rule_by_number_buffer($filterent['rulenum'],$filterent['act']);?></td> + <td colspan="4" class="listMRDescriptionR listMRr nowrap"><?=find_rule_by_number_buffer($filterent['rulenum'],$filterent['tracker'],$filterent['act']);?></td> </tr> <?php endif; endforeach; |
