diff --git a/data/web/admin.php b/data/web/admin.php index 58d17ab3..19c78022 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -846,7 +846,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC if (!empty($f2b_data['active_bans'])): foreach ($f2b_data['active_bans'] as $active_bans): ?> -
=$active_bans['network'];?> (=$active_bans['banned_until'];?>) -
+ =$active_bans['network'];?>(=$active_bans['banned_until'];?>) -
@@ -870,7 +870,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
if (!empty($f2b_data['perm_bans'])):
foreach ($f2b_data['perm_bans'] as $perm_bans):
?>
- =$perm_bans?>
+ =$perm_bans['network'];?>
hGetAll('F2B_PERM_BANS');
if (is_array($pb)) {
foreach ($pb as $key => $value) {
- $f2b_options['perm_bans'][] = $key;
+ $f2b_options['perm_bans'][] = array(
+ 'network'=>$key,
+ 'ip' => strtok($key,'/')
+ );
+
}
}
else {
@@ -61,6 +65,7 @@ function fail2ban($_action, $_data = null) {
$f2b_options['active_bans'][] = array(
'queued_for_unban' => $queued_for_unban,
'network' => $network,
+ 'ip' => strtok($network,'/'),
'banned_until' => sprintf('%02dh %02dm %02ds', ($difference/3600), ($difference/60%60), $difference%60)
);
}