aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/pfblockerng/pfblockerng.inc14
-rw-r--r--config/pfblockerng/pfblockerng_alerts.php4
-rw-r--r--config/pfblockerng/pfblockerng_log.php12
3 files changed, 15 insertions, 15 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index dafdac3e..2f0c90de 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -937,7 +937,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr']= "{$pfb_alias}{$vtype}{$pfb['suffix']}";
$rule['source'] = array("any" => "");
$rule['destination'] = array ("address" => "{$pfb_alias}{$vtype}");
- if ($pfb['config']['enable_log'] || $pfb_contlog == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $pfb_contlog == "enabled")
$rule['log'] = "";
$deny_outbound[] = $rule;
if ($continent_config['action'] != "Deny_Both")
@@ -952,7 +952,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr'] = "{$pfb_alias}{$vtype}{$pfb['suffix']}";
$rule['source'] = array("address" => "{$pfb_alias}{$vtype}");
$rule['destination'] = array ("any" => "");
- if ($pfb['config']['enable_log'] || $pfb_contlog == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $pfb_contlog == "enabled")
$rule['log'] = "";
$deny_inbound[] = $rule;
break;
@@ -967,7 +967,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr'] = "{$pfb_alias}{$vtype}{$pfb['suffix']}";
$rule['source'] = array ("any" => "");
$rule['destination'] = array("address" => "{$pfb_alias}{$vtype}");
- if ($pfb['config']['enable_log'] || $pfb_contlog == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $pfb_contlog == "enabled")
$rule['log'] = "";
$permit_outbound[] = $rule;
if ($continent_config['action'] != "Permit_Both")
@@ -982,7 +982,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr'] = "{$pfb_alias}{$vtype}{$pfb['suffix']}";
$rule['source'] = array("address"=> "{$pfb_alias}{$vtype}");
$rule['destination'] = array ("any" => "");
- if ($pfb['config']['enable_log'] || $pfb_contlog == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $pfb_contlog == "enabled")
$rule['log'] = "";
$permit_inbound[] = $rule;
break;
@@ -1010,7 +1010,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr'] = "{$pfb_alias}{$vtype}{$pfb['suffix']}";
$rule['source'] = array ("address" => "{$pfb_alias}{$vtype}");
$rule['destination'] = array ( "any" => "");
- if ($pfb['config']['enable_log'] || $pfb_contlog == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $pfb_contlog == "enabled")
$rule['log'] = "";
$match_inbound[] = $rule;
break;
@@ -1710,7 +1710,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr'] = "{$alias}{$pfb['suffix']}";
$rule['source'] = array ("address" => "{$alias}");
$rule['destination'] = array ("any" => "");
- if ($pfb['config']['enable_log'] || $alias_log == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $alias_log == "enabled")
$rule['log'] = "";
$permit_inbound[] = $rule;
break;
@@ -1738,7 +1738,7 @@ function sync_package_pfblockerng($cron = "") {
$rule['descr'] = "{$alias}{$pfb['suffix']}";
$rule['source'] = array ("address" => "{$alias}");
$rule['destination'] = array ("any" => "");
- if ($pfb['config']['enable_log'] || $alias_log == "enabled")
+ if ($pfb['config']['enable_log'] == "on" || $alias_log == "enabled")
$rule['log'] = "";
$match_inbound[] = $rule;
break;
diff --git a/config/pfblockerng/pfblockerng_alerts.php b/config/pfblockerng/pfblockerng_alerts.php
index b14e9210..bf409572 100644
--- a/config/pfblockerng/pfblockerng_alerts.php
+++ b/config/pfblockerng/pfblockerng_alerts.php
@@ -392,12 +392,12 @@ if ($savemsg) {
<!--Print Table Info-->
<td colspan="2" class="listtopic"><?php printf(gettext("&nbsp;{$type}&nbsp;&nbsp; - &nbsp; Last %s Alert Entries."), "{$pfbentries}"); ?>
<?php if ($pfb['pfsenseversion'] >= '2.2'): ?>
- <?php if (!array_key_exists("reverse", $config['syslog'])): ?>
+ <?php if (!is_array($config['syslog']) || !array_key_exists("reverse", $config['syslog'])): ?>
&nbsp;&nbsp;<?php echo gettext("Firewall Logs must be in Reverse Order."); ?>
<?php endif; ?>
<?php else: ?>
&nbsp;&nbsp;<?php echo gettext("Firewall Rule changes can unsync these Alerts."); ?>
- <?php if (!array_key_exists("reverse", $config['syslog'])): ?>
+ <?php if (!is_array($config['syslog']) || !array_key_exists("reverse", $config['syslog'])): ?>
&nbsp;&nbsp;<?php echo gettext("Firewall Logs must be in Reverse Order."); ?>
<?php endif; ?>
<?php endif; ?>
diff --git a/config/pfblockerng/pfblockerng_log.php b/config/pfblockerng/pfblockerng_log.php
index a1012984..086f8f84 100644
--- a/config/pfblockerng/pfblockerng_log.php
+++ b/config/pfblockerng/pfblockerng_log.php
@@ -102,34 +102,34 @@ $pfb_logtypes = array( 'defaultlogs' => array('name' => 'Log Files',
),
'originallogs' => array('name' => 'Original Files',
'ext' => array('orig', 'raw'),
- 'logdir' => "{$pfb['dbdir']}/original/",
+ 'logdir' => "{$pfb['origdir']}/",
'download' => TRUE,
'clear' => TRUE
),
'denylogs' => array('name' => 'Deny Files',
'ext' => 'txt',
'txt' => 'deny',
- 'logdir' => "{$pfb['dbdir']}/deny/",
+ 'logdir' => "{$pfb['denydir']}/",
'download' => TRUE,
'clear' => FALSE
),
'permitlogs' => array('name' => 'Permit Files',
'ext' => 'txt',
'txt' => 'permit',
- 'logdir' => "{$pfb['dbdir']}/permit/",
+ 'logdir' => "{$pfb['permitdir']}/",
'download' => TRUE,
'clear' => FALSE
),
'matchlogs' => array('name' => 'Match Files',
'ext' => 'txt',
'txt' => 'match',
- 'logdir' => "{$pfb['dbdir']}/match/",
+ 'logdir' => "{$pfb['matchdir']}/",
'download' => TRUE,
'clear' => FALSE
),
'nativelogs' => array('name' => 'Native Files',
'ext' => 'txt',
- 'logdir' => "{$pfb['dbdir']}/native/",
+ 'logdir' => "{$pfb['nativedir']}/",
'download' => TRUE,
'clear' => FALSE
),
@@ -140,7 +140,7 @@ $pfb_logtypes = array( 'defaultlogs' => array('name' => 'Log Files',
'clear' => FALSE
),
'etiprep' => array('name' => 'ET IPRep Files',
- 'ext' => 'txt',
+ 'ext' => '*',
'logdir' => "{$pfb['etdir']}/",
'download' => TRUE,
'clear' => FALSE
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 15:33:09 +0000