From 1edc4a37bf49fed4e82a9b0b359a39b45fc60385 Mon Sep 17 00:00:00 2001 From: Shish Date: Wed, 27 Nov 2019 19:55:25 +0000 Subject: [PATCH] remove sys_ip_bans --- ext/rule34/main.php | 47 ------------------------------------------ ext/rule34/theme.php | 49 -------------------------------------------- 2 files changed, 96 deletions(-) diff --git a/ext/rule34/main.php b/ext/rule34/main.php index 945fe1f8..4499832e 100644 --- a/ext/rule34/main.php +++ b/ext/rule34/main.php @@ -124,52 +124,5 @@ class Rule34 extends Extension $page->set_redirect(make_link("admin")); } } - - if ($event->page_matches("sys_ip_ban")) { - global $page, $user; - if ($user->can(Permissions::BAN_IP)) { - if ($event->get_arg(0) == "list") { - $bans = (isset($_GET["all"])) ? $this->get_bans() : $this->get_active_bans(); - $this->theme->display_bans($page, $bans); - } - } else { - $this->theme->display_permission_denied(); - } - } - } - - private function get_bans() - { - global $database; - $bans = $database->get_all(" - SELECT sys_ip_bans.*, users.name as banner_name - FROM sys_ip_bans - JOIN users ON banner_id = users.id - ORDER BY time_start, time_end, sys_ip_bans.id - "); - if ($bans) { - return $bans; - } else { - return []; - } - } - - private function get_active_bans() - { - global $database; - - $bans = $database->get_all(" - SELECT sys_ip_bans.*, users.name as banner_name - FROM sys_ip_bans - JOIN users ON banner_id = users.id - WHERE (time_end > now()) OR (time_end IS NULL) - ORDER BY time_end, sys_ip_bans.id - "); - - if ($bans) { - return $bans; - } else { - return []; - } } } diff --git a/ext/rule34/theme.php b/ext/rule34/theme.php index f71d8c15..af681b17 100644 --- a/ext/rule34/theme.php +++ b/ext/rule34/theme.php @@ -14,53 +14,4 @@ class Rule34Theme extends Themelet $page->add_block(new Block("Rule34 Comic Options", $html)); } - - public function display_bans(Page $page, array $bans) - { - global $database, $user; - $h_bans = ""; - $prefix = ($database->get_driver_name() == DatabaseDriver::SQLITE ? "bans." : ""); - foreach ($bans as $ban) { - $h_bans .= " - - {$ban[$prefix.'ip']} - {$ban[$prefix.'reason']} - {$ban['banner_name']} - ".substr($ban[$prefix.'time_start'], 0, 10)." - ".substr($ban[$prefix.'time_end'], 0, 10)." - - - "; - } - $html = " - Show All -

- - $h_bans - -
IPReasonByFromUntil
- "; - $page->set_title("IP Bans"); - $page->set_heading("IP Bans"); - $page->add_block(new NavBlock()); - $page->add_block(new Block("Edit IP Bans", $html)); - } }