harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

bans.php: use modern array syntax

Browse Source
This commit is contained in:
Zankaria 2024-07-01 21:56:35 +02:00 committed by Zankaria
parent 82b8eb1e74
commit cc5e96eb9d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/bans.php
View File

@ -60,7 +60,7 @@ class Bans {
if ($ban['post']) { if ($ban['post']) {
$ban['post'] = json_decode($ban['post'], true); $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; $found_ban = $ban;
} }
} }
@ -116,7 +116,7 @@ class Bans {
if ($ban['post']) { if ($ban['post']) {
$ban['post'] = json_decode($ban['post'], true); $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; $ban_list[] = $ban;
} }
} }
@ -176,7 +176,7 @@ class Bans {
$cidr = new CIDR($mask); $cidr = new CIDR($mask);
$range = $cidr->getRange(); $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) { public static function parse_time($str) {
@ -260,7 +260,7 @@ class Bans {
return false; 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 { 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); $end = end($bans);
foreach ($bans as &$ban) { foreach ($bans as &$ban) {
$uncloaked_mask = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); $ban['mask'] = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
$ban['mask'] = cloak_mask($uncloaked_mask);
if ($ban['post']) { if ($ban['post']) {
$post = json_decode($ban['post']); $post = json_decode($ban['post']);
@ -373,8 +372,7 @@ class Bans {
if ($boards !== false && !in_array($ban['board'], $boards)) if ($boards !== false && !in_array($ban['board'], $boards))
error($config['error']['noaccess']); error($config['error']['noaccess']);
$mask = self::range_to_string(array($ban['ipstart'], $ban['ipend'])); $mask = self::range_to_string([$ban['ipstart'], $ban['ipend']]);
$cloaked_mask = cloak_mask($mask);
modLog("Removed ban #{$ban_id} for " . modLog("Removed ban #{$ban_id} for " .
(filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$cloaked_mask\">$cloaked_mask</a>" : $cloaked_mask)); (filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$cloaked_mask\">$cloaked_mask</a>" : $cloaked_mask));