From 451733431d1a8685a9691734aae22eae00cdc3d5 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Mon, 8 Dec 2014 00:08:47 -0500 Subject: Mods to the Alerts Tab --- config/pfblockerng/pfblockerng_alerts.php | 59 +++++++++++++++++-------------- 1 file changed, 32 insertions(+), 27 deletions(-) (limited to 'config/pfblockerng/pfblockerng_alerts.php') diff --git a/config/pfblockerng/pfblockerng_alerts.php b/config/pfblockerng/pfblockerng_alerts.php index 0f754a69..093db281 100644 --- a/config/pfblockerng/pfblockerng_alerts.php +++ b/config/pfblockerng/pfblockerng_alerts.php @@ -63,7 +63,7 @@ if (empty($et_header)) $pfb['et_header'] = FALSE; // Collect pfBlockerNGSuppress Alias and Create pfbsuppression.txt -if ($pfb['supp'] == "on") +if ($pfb['supp'] == "on") pfb_create_suppression_file(); // Collect Number of Suppressed Hosts @@ -294,7 +294,7 @@ $pgtitle = gettext("pfBlockerNG: Alerts"); include_once("head.inc"); ?> -
+ @@ -305,7 +305,7 @@ include_once("fbegin.inc"); /* refresh every 60 secs */ if ($alertrefresh == 'on') - echo "\n"; + echo "\n"; if ($savemsg) { print_info_box($savemsg); } @@ -336,7 +336,7 @@ if ($savemsg) { -
+
- $pfb['denydir'], "Permit" => $pfb['permitdir'], "Match" => $pfb['matchdir']) as $type => $pfbfolder ) { + + + $pfb['denydir'], "Permit" => $pfb['permitdir'], "Match" => $pfb['matchdir']) as $type => $pfbfolder ): switch($type) { case "Deny": $rtype = "block"; @@ -390,12 +389,18 @@ foreach (array ("Deny" => $pfb['denydir'], "Permit" => $pfb['permitdir'], "Match ?>
  @@ -364,10 +364,9 @@ if ($savemsg) {        ', '');?>
- @@ -531,7 +536,7 @@ if (isset($fields_array)) { $dstport = " :" . $fields['dstport']; } - // Don't add Suppress Icon to Country Block Lines + // Don't add Suppress Icon to Country Block Lines if (in_array(substr($rule_list[$rulenum]['name'], 0, -3), $continents)) { $pfb_query = "Country"; } @@ -564,10 +569,10 @@ if (isset($fields_array)) { $hostname = ""; } - $src_icons = $alert_ip . " " . $supp_ip . " "; + $src_icons = $alert_ip . " " . $supp_ip . " "; $dst_icons = ""; $scc = $country; - $dcc = ""; + $dcc = ""; } else { // Outbound $rule = $rule_list[$rulenum]['name'] . "
(" . $rulenum .")"; @@ -596,7 +601,7 @@ if (isset($fields_array)) { } $src_icons = ""; - $dst_icons = $alert_ip . " " . $supp_ip . " "; + $dst_icons = $alert_ip . " " . $supp_ip . " "; $scc = ""; $dcc = $country; } @@ -630,6 +635,7 @@ if (isset($fields_array)) { for ($cnt = 1; $cnt <= 5; $cnt++) { $host3 = $host2 - $cnt . '\''; $pfb_query = exec("grep -H {$host1}{$host3} {$pfbfolder}/* | sed -e 's/^.*[a-zA-Z]\///' -e 's/\.txt:/ /' | {$pfb_ex2}"); + // Break out of loop if found. if (!empty($pfb_query)) $cnt = 6; } @@ -653,6 +659,7 @@ if (isset($fields_array)) { $pfb_query = exec("grep -Hm1 {$host1} {$pfbfolder}/* | sed -e 's/^.*[a-zA-Z]\///' -e 's/\.txt:/ /' | {$pfb_ex1}"); } } + // Default to "No Match" if not found. if (empty($pfb_query)) $pfb_query = "No Match"; } @@ -693,7 +700,7 @@ if (isset($fields_array)) { - "; + "; $counter++; if ($counter > 0 && $rtype == "block") { $mycounter = $counter; @@ -705,19 +712,16 @@ if (isset($fields_array)) {
- = '2.2') { ?> -    - -    - + + + = '2.2'): ?> + +    + + +    + +    + +
{$src_icons}{$fields['srcip']}{$srcport}
{$hostname['src']}		 {$dst_icons}{$fields['dstip']}{$dstport}
{$hostname['dst']}		 {$countrycode}{$pfb_match[1]}
{$pfb_match[2]}
{$pfb_match[1]}
{$pfb_match[2]}
- +
- - \ No newline at end of file + + + + \ No newline at end of file -- cgit v1.2.3