diff --git a/etc/inc/filter_log.inc b/etc/inc/filter_log.inc index 31d3f60a4a..c0067faa41 100644 --- a/etc/inc/filter_log.inc +++ b/etc/inc/filter_log.inc @@ -294,7 +294,7 @@ function find_rule_by_number_buffer($rulenum, $type){ } else { $ruleString = $buffer_rules_normal["@".$rulenum]; list(,$rulename,) = explode("\"",$ruleString); - $rulename = str_replace("USER_RULE: ",'USER_RULE ',$rulename); + $rulename = str_replace("USER_RULE: ",'USER_RULE ',htmlspecialchars($rulename)); } return $rulename." (@".$rulenum.")"; } diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 633839636b..419264945d 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -68,7 +68,7 @@ $filtersubmit = getGETPOSTsettingvalue('filtersubmit', null); if ($filtersubmit) { $interfacefilter = getGETPOSTsettingvalue('interface', null); $filtertext = getGETPOSTsettingvalue('filtertext', ""); - $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); + $filter_qty = getGETPOSTsettingvalue('filter_qty', null); } $filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null); @@ -100,6 +100,9 @@ $nentries = $config['syslog']['nentries']; if ($filterlogentries_qty) $nentries = $filterlogentries_qty; +if ($filter_qty) + $nentries = $filter_qty; + if (!$nentries) $nentries = 50; @@ -135,11 +138,11 @@ include("head.inc");
- "> +
"> - + + - - + + + + + + + + - "); - + $int = strtolower($filterent['interface']); $proto = strtolower($filterent['proto']); if(is_ipaddrv6($filterent['srcip'])) { @@ -348,7 +361,7 @@ include("head.inc"); $dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto); ?> + + + + + + + + - - - - -
-
> +
>
- - - - - - -
-
-
- /> Pass
- /> Block
- /> Reject
+
+
+
+ /> Pass
+ /> Block
+ /> Reject
 -
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+ 		+
+
-
-
+ 		+
+
-
-
+ 		+
+
-
-
+ 		+
+
-
" />
+ 		+
" />
- ', '');?>   -    + + ', '');?>   +   
-
> +
>
-
-
-
- + $ifacename): ?> - +
-
-
+
+
-
-
+
+
-
 
-
" />
+
 
+
" />
- ', '');?>   + + ', '');?>  
-
+
| |
-
+
Show/hide rule descriptions @@ -300,17 +303,27 @@ include("head.inc");
- - + + - - +
+
+ " /> +
+
+
', outputrule);"> <?php echo $filterent['act'];?> @@ -333,7 +346,7 @@ include("head.inc"); ".find_rule_by_number_buffer($filterent['rulenum'],$filterent['act'])."
 - &dialog_output=true', outputrule);" title=""> + &dialog_output=true', outputrule);" title=""> Icon Reverse Resolve with DNS "> Icon Reverse Resolve with DNS @@ -357,7 +370,7 @@ include("head.inc"); - &dialog_output=true', outputrule);" title=""> + &dialog_output=true', outputrule);" title=""> Icon Reverse Resolve with DNS "> Icon Reverse Resolve with DNS @@ -379,27 +392,31 @@ include("head.inc"); +
+
+ " /> +
+
-
- " /> -
-
diff --git a/usr/local/www/javascript/sorttable.js b/usr/local/www/javascript/sorttable.js index ce2e68a95c..a780aa5166 100644 --- a/usr/local/www/javascript/sorttable.js +++ b/usr/local/www/javascript/sorttable.js @@ -74,8 +74,8 @@ sorttable = { if (headrow == undefined) return; - if (table.getAttribute("sortableMultirow") != undefined) - sortableMultirow = parseInt(table.getAttribute("sortableMultirow")); + if (table.style.sortableMultirow != undefined) + sortableMultirow = parseInt(table.style.sortableMultirow); else sortableMultirow = 1; @@ -247,8 +247,8 @@ sorttable = { hasInputs = (typeof node.getElementsByTagName == 'function') && node.getElementsByTagName('input').length; - if (node.getAttribute("sorttable_customkey") != null) { - return node.getAttribute("sorttable_customkey"); + if (node.style.sorttable_customkey != null) { + return node.style.sorttable_customkey; } else if (typeof node.textContent != 'undefined' && !hasInputs) { return node.textContent.replace(/^\s+|\s+$/g, '');