diff options
| author | BBcan177 <bbcan177@gmail.com> | 2015-11-22 20:30:01 -0500 |
|---|---|---|
| committer | BBcan177 <bbcan177@gmail.com> | 2015-11-22 20:30:01 -0500 |
| commit | 23481ebcb529f8c47a72dc7121401971f9e68213 (patch) | |
| tree | cc6b73d9c4ce3de6ba2a8c4cf3cf1388b3c9d2c0 /config/pfblockerng/pfblockerng.inc | |
| parent | 6960a63f992f117413d7b1897368795d69aa746e (diff) | |
| download | pfsense-packages-23481ebcb529f8c47a72dc7121401971f9e68213.tar.gz pfsense-packages-23481ebcb529f8c47a72dc7121401971f9e68213.tar.bz2 pfsense-packages-23481ebcb529f8c47a72dc7121401971f9e68213.zip | |
pfBlockerNG - Minor fixes
Diffstat (limited to 'config/pfblockerng/pfblockerng.inc')
| -rw-r--r-- | config/pfblockerng/pfblockerng.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 9ee253fd..7ddbb565 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -2360,7 +2360,7 @@ function sync_package_pfblockerng($cron='') { } if (!empty($list['custom'])) { - $list['row'][] = array( 'header' => "{$list['aliasname']}_custom", + $list['row'][] = array( 'header' => preg_replace("/\W/", '', $list['aliasname']) . '_custom', 'custom' => $list['custom'], 'state' => 'Enabled', 'update' => $list['custom_update'], @@ -2433,9 +2433,9 @@ function sync_package_pfblockerng($cron='') { if (file_exists("{$pfbfolder}/{$header}.txt") && $pfbreuse == '') { if ($row['state'] == 'Hold') { - $log = "\n[ {$header} ]{$logtab} Static Hold [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} static hold. [ NOW ]"; } else { - $log = "\n[ {$header} ]{$logtab} exists, Reloading [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} exists. [ NOW ]"; } pfb_logger("{$log}", 1); @@ -3135,7 +3135,7 @@ function sync_package_pfblockerng($cron='') { if ($continent === $continent_ex && !empty($pfctlck) && file_exists("{$pfbfolder}/{$ccfile}.txt") && $pfb['reuse'] == '') { if (!$pfb['save']) { - $log = "\n[ {$pfb_alias}{$vtype} ]{$logtab} exists, Reloading [ NOW ]"; + $log = "\n[ {$pfb_alias}{$vtype} ]{$logtab} exists. [ NOW ]"; pfb_logger("{$log}", 1); } } else { @@ -3252,7 +3252,7 @@ function sync_package_pfblockerng($cron='') { } if (!empty($list['custom'])) { - $list['row'][] = array( 'header' => "{$list['aliasname']}_custom", + $list['row'][] = array( 'header' => preg_replace("/\W/", '', $list['aliasname']) . '_custom', 'custom' => $list['custom'], 'state' => 'Enabled', 'update' => $list['custom_update'], @@ -3307,9 +3307,9 @@ function sync_package_pfblockerng($cron='') { if (file_exists("{$pfbfolder}/{$header}.txt") && $pfbreuse == '') { if ($row['state'] == 'Hold') { - $log = "\n[ {$header} ]{$logtab} Static Hold [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} static hold. [ NOW ]"; } else { - $log = "\n[ {$header} ]{$logtab} exists, Reloading [ NOW ]"; + $log = "\n[ {$header} ]{$logtab} exists. [ NOW ]"; } pfb_logger("{$log}", 1); } else { |