diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-08-31 18:48:20 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-08-31 18:48:20 +0000 |
| commit | 2372853db3801881a165fc6083ece00f2d66f989 (patch) | |
| tree | f75a64eb2e900f73c6102741623d818ebf4bebdf /usr/local/www/diag_logs_filter.php | |
| parent | 67ac4e8d3b4cb1b9f63522d846e10cb62371481a (diff) | |
| download | pfsense-2372853db3801881a165fc6083ece00f2d66f989.zip pfsense-2372853db3801881a165fc6083ece00f2d66f989.tar.gz | |
Do not try to convert twice the real interface to the friendly descr. This fixes the empty interface column on System Logs->Firewall tab log viewer.
Diffstat (limited to 'usr/local/www/diag_logs_filter.php')
| -rwxr-xr-x | usr/local/www/diag_logs_filter.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index cd74e2d..11e7478 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -136,12 +136,7 @@ function conv_clog($logfile, $tail = 50) { $flent['time'] = $log_split[1]; $flent['act'] = $log_split[3]; - $friendly_int = convert_real_interface_to_friendly_interface_name($log_split[4]); - - $flent['interface'] = strtoupper($friendly_int); - - if($config['interfaces'][$friendly_int]['descr'] <> "") - $flent['interface'] = "{$config['interfaces'][$friendly_int]['descr']}"; + $flent['interface'] = convert_real_interface_to_friendly_descr($log_split[4]); $tmp = split("/", $log_split[2]); $flent['rulenum'] = $tmp[0]; @@ -244,7 +239,7 @@ include("head.inc"); <img border="0" src="<?=$img;?>" width="11" height="11" align="absmiddle"> <?php if ($filterent['count']) echo $filterent['count'];?></td> <td class="listr" nowrap><?=htmlspecialchars($filterent['time']);?></td> - <td class="listr" nowrap><?=htmlspecialchars(convert_real_interface_to_friendly_interface_name($filterent['interface']));?></td> + <td class="listr" nowrap><?=htmlspecialchars($filterent['interface']);?></td> <td class="listr" nowrap><?=htmlspecialchars($filterent['src']);?></td> <td class="listr" nowrap><?=htmlspecialchars($filterent['dst']);?></td> <td class="listr" nowrap><?=htmlspecialchars($filterent['proto']);?></td> |
