Projet

Général

Profil

« Précédent | Suivant » 

Révision 481b97b0

Ajouté par jim-p il y a presque 10 ans

Consider tracker IDs when looking up filter log entries, if present

Voir les différences:

usr/local/www/diag_logs_filter.php
72 72

  
73 73
$rulenum = getGETPOSTsettingvalue('getrulenum', null);
74 74
if($rulenum) {
75
	list($rulenum, $type) = explode(',', $rulenum);
76
	$rule = find_rule_by_number($rulenum, $type);
75
	list($rulenum, $tracker, $type) = explode(',', $rulenum);
76
	$rule = find_rule_by_number($rulenum, $tracker, $type);
77 77
	echo gettext("The rule that triggered this action is") . ":\n\n{$rule}";
78 78
	exit;
79 79
}
......
341 341
			<tr class="<?=$evenRowClass?>">
342 342
			  <td class="listMRlr nowrap" align="center" sorttable_customkey="<?=$filterent['act']?>">
343 343
			  <center>
344
			  <a onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?php echo "{$filterent['rulenum']},{$filterent['act']}"; ?>', outputrule);">
345
			  <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'];?>" />
344
			  <a onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?php echo "{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);">
345
			  <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'];?>" />
346 346
			  <?php if ($filterent['count']) echo $filterent['count'];?></a></center></td>
347 347
			  <td class="listMRr" nowrap="nowrap"><?php echo htmlspecialchars($filterent['time']);?></td>
348 348
			  <td class="listMRr" nowrap="nowrap">
......
352 352
				<?php echo htmlspecialchars($filterent['interface']);?></td>
353 353
			  <?php 
354 354
			  if ($config['syslog']['filterdescriptions'] === "1")
355
				echo("<td class=\"listMRr nowrap\">".find_rule_by_number_buffer($filterent['rulenum'],$filterent['act'])."</td>");
355
				echo("<td class=\"listMRr nowrap\">".find_rule_by_number_buffer($filterent['rulenum'],$filterent['tracker'],$filterent['act'])."</td>");
356 356
				
357 357
			  $int = strtolower($filterent['interface']);
358 358
			  $proto = strtolower($filterent['proto']);
......
390 390
			<?php if (isset($config['syslog']['filterdescriptions']) && $config['syslog']['filterdescriptions'] === "2"):?>
391 391
			<tr class="<?=$evenRowClass?>">
392 392
			  <td colspan="2" class="listMRDescriptionL listMRlr" />
393
			  <td colspan="4" class="listMRDescriptionR listMRr nowrap"><?=find_rule_by_number_buffer($filterent['rulenum'],$filterent['act']);?></td>
393
			  <td colspan="4" class="listMRDescriptionR listMRr nowrap"><?=find_rule_by_number_buffer($filterent['rulenum'],$filterent['tracker'],$filterent['act']);?></td>
394 394
			</tr>
395 395
			<?php endif;
396 396
			endforeach; 

Formats disponibles : Unified diff