From cc5e96eb9d5344fe8e8f366dddcf00f50ccb678f Mon Sep 17 00:00:00 2001 From: Zankaria Date: Mon, 1 Jul 2024 21:56:35 +0200 Subject: [PATCH] bans.php: use modern array syntax --- inc/bans.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/inc/bans.php b/inc/bans.php index bc65ab8f..0e462a7b 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -60,7 +60,7 @@ class Bans { if ($ban['post']) { $ban['post'] = json_decode($ban['post'], true); } - $ban['mask'] = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); + $ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]); $found_ban = $ban; } } @@ -116,7 +116,7 @@ class Bans { if ($ban['post']) { $ban['post'] = json_decode($ban['post'], true); } - $ban['mask'] = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); + $ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]); $ban_list[] = $ban; } } @@ -176,7 +176,7 @@ class Bans { $cidr = new CIDR($mask); $range = $cidr->getRange(); - return array(inet_pton($range[0]), inet_pton($range[1])); + return [ inet_pton($range[0]), inet_pton($range[1]) ]; } public static function parse_time($str) { @@ -260,7 +260,7 @@ class Bans { return false; } - return array($ipstart, $ipend); + return [$ipstart, $ipend]; } static public function findSingle(string $ip, int $ban_id, bool $require_ban_view, bool $auto_gc): array|null { @@ -294,8 +294,7 @@ class Bans { $end = end($bans); foreach ($bans as &$ban) { - $uncloaked_mask = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); - $ban['mask'] = cloak_mask($uncloaked_mask); + $ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]); if ($ban['post']) { $post = json_decode($ban['post']); @@ -373,8 +372,7 @@ class Bans { if ($boards !== false && !in_array($ban['board'], $boards)) error($config['error']['noaccess']); - $mask = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); - $cloaked_mask = cloak_mask($mask); + $mask = self::range_to_string([$ban['ipstart'], $ban['ipend']]); modLog("Removed ban #{$ban_id} for " . (filter_var($mask, FILTER_VALIDATE_IP) !== false ? "$cloaked_mask" : $cloaked_mask));