|
@@ -46,7 +46,11 @@ function fail2ban($_action, $_data = null) {
|
|
$pb = $redis->hGetAll('F2B_PERM_BANS');
|
|
$pb = $redis->hGetAll('F2B_PERM_BANS');
|
|
if (is_array($pb)) {
|
|
if (is_array($pb)) {
|
|
foreach ($pb as $key => $value) {
|
|
foreach ($pb as $key => $value) {
|
|
- $f2b_options['perm_bans'][] = $key;
|
|
|
|
|
|
+ $f2b_options['perm_bans'][] = array(
|
|
|
|
+ 'network'=>$key,
|
|
|
|
+ 'ip' => strtok($key,'/')
|
|
|
|
+ );
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
@@ -61,6 +65,7 @@ function fail2ban($_action, $_data = null) {
|
|
$f2b_options['active_bans'][] = array(
|
|
$f2b_options['active_bans'][] = array(
|
|
'queued_for_unban' => $queued_for_unban,
|
|
'queued_for_unban' => $queued_for_unban,
|
|
'network' => $network,
|
|
'network' => $network,
|
|
|
|
+ 'ip' => strtok($network,'/'),
|
|
'banned_until' => sprintf('%02dh %02dm %02ds', ($difference/3600), ($difference/60%60), $difference%60)
|
|
'banned_until' => sprintf('%02dh %02dm %02ds', ($difference/3600), ($difference/60%60), $difference%60)
|
|
);
|
|
);
|
|
}
|
|
}
|