summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2014-02-19 15:27:09 +0100
committerErmal Luçi <eri@pfsense.org>2014-02-19 15:27:09 +0100
commit6b2df902cd00b7fc573c3283e43ccd1a010b4e87 (patch)
tree8e78a2d4cc6f5667c97438fbf798ca566704dab2 /usr
parentecdf264f3d1b098cfef82b900ebd3d01a61ecf1d (diff)
parent30a840368fb30ddf138b730eb0f381749b49cff5 (diff)
downloadpfsense-6b2df902cd00b7fc573c3283e43ccd1a010b4e87.zip
pfsense-6b2df902cd00b7fc573c3283e43ccd1a010b4e87.tar.gz
Merge pull request #947 from stilez/patch-2
Filter log - ensure IPv6 AJAX resolve works too
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/diag_logs_filter.php6
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 09a683f..0daefcf 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -365,9 +365,9 @@ include("head.inc");
}
$srcstr = $filterent['srcip'] . get_port_with_service($filterent['srcport'], $proto);
- $src_htmlclass = str_replace('.', '-', $filterent['srcip']);
+ $src_htmlclass = str_replace(array('.', ':'), '-', $filterent['srcip']);
$dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto);
- $dst_htmlclass = str_replace('.', '-', $filterent['dstip']);
+ $dst_htmlclass = str_replace(array('.', ':'), '-', $filterent['dstip']);
?>
<td class="listMRr nowrap">
<img onclick="javascript:resolve_with_ajax('<?php echo "{$filterent['srcip']}"; ?>');" title="<?=gettext("Click to resolve");?>" class="ICON-<?= $src_htmlclass; ?>" border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_log.gif" alt="Icon Reverse Resolve with DNS"/>
@@ -447,7 +447,7 @@ function resolve_with_ajax(ip_to_resolve) {
function resolve_ip_callback(transport) {
var response = jQuery.parseJSON(transport.responseText);
- var resolve_class = htmlspecialchars(response.resolve_ip.replace(/\./g, '-'));
+ var resolve_class = htmlspecialchars(response.resolve_ip.replace(/[.:]/g, '-'));
var resolve_text = '<small><br/>' + htmlspecialchars(response.resolve_text) + '</small>';
jQuery('span.RESOLVE-' + resolve_class).html(resolve_text);
OpenPOWER on IntegriCloud