From 439fab95ae5615c245e6177c8623e361793d79c3 Mon Sep 17 00:00:00 2001 From: ruan Date: Sun, 8 Sep 2019 09:13:49 +0200 Subject: [PATCH] Add server origin column, disabled by default --- bans.php | 13 +++++++------ history.php | 15 ++++++++------- inc/page.php | 3 +++ inc/settings.php | 3 +++ kicks.php | 10 +++++----- mutes.php | 13 +++++++------ warnings.php | 11 ++++++----- 7 files changed, 39 insertions(+), 29 deletions(-) diff --git a/bans.php b/bans.php index fc7e63a..ca457f3 100644 --- a/bans.php +++ b/bans.php @@ -16,12 +16,13 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "player" => $page->get_avatar($player_name, $row['uuid']), - "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "reason" => $page->clean($row['reason']), - "date" => $page->millis_to_date($row['time']), - "expires" => $page->expiry($row), - "server.name" => $page->server($row), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "expires" => $page->expiry($row), + "server.name" => $page->server($row), + "server.origin" => $page->server($row, "server_origin"), )); } $page->table_end(); diff --git a/history.php b/history.php index b675389..0bee225 100644 --- a/history.php +++ b/history.php @@ -200,13 +200,14 @@ try { $label = "$label_name"; $page->print_table_rows($row, array( - "type" => $label, - "player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), - "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "reason" => $page->clean($row['reason']), - "date" => $page->millis_to_date($row['time']), - "expires" => $page->expiry($row), - "server.name" => $page->server($row), + "type" => $label, + "player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "expires" => $page->expiry($row), + "server.name" => $page->server($row), + "server.origin" => $page->server($row, "server_origin"), )); } diff --git a/inc/page.php b/inc/page.php index 0589240..a8d50db 100644 --- a/inc/page.php +++ b/inc/page.php @@ -449,6 +449,9 @@ class Page { if (!$this->settings->show_server_scope) { unset($array["server.name"]); } + if (!$this->settings->show_server_origin) { + unset($array["server.origin"]); + } if ($print_headers && !$this->table_headers_printed) { $headers = array_keys($array); $headers_translated = array(); diff --git a/inc/settings.php b/inc/settings.php index 467e7f4..22bfe7f 100644 --- a/inc/settings.php +++ b/inc/settings.php @@ -40,6 +40,9 @@ final class Settings { // Show server scope column? $this->show_server_scope = false; + // Show server origin column? + $this->show_server_origin = false; + // Show inactive bans? Removed bans will show (Unbanned), mutes will show (Unmuted), warnings will show (Expired). $this->show_inactive_bans = true; diff --git a/kicks.php b/kicks.php index e06ee00..b8a7428 100644 --- a/kicks.php +++ b/kicks.php @@ -16,11 +16,11 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "player" => $page->get_avatar($player_name, $row['uuid']), - "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "reason" => $page->clean($row['reason']), - "date" => $page->millis_to_date($row['time']), - "server.name" => $page->server($row, "server_origin"), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "server.origin" => $page->server($row, "server_origin"), )); } $page->table_end(); diff --git a/mutes.php b/mutes.php index 7e2bd60..9960e6c 100644 --- a/mutes.php +++ b/mutes.php @@ -16,12 +16,13 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "player" => $page->get_avatar($player_name, $row['uuid']), - "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "reason" => $page->clean($row['reason']), - "date" => $page->millis_to_date($row['time']), - "expires" => $page->expiry($row), - "server.name" => $page->server($row), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "expires" => $page->expiry($row), + "server.name" => $page->server($row), + "server.origin" => $page->server($row, "server_origin"), )); } $page->table_end(); diff --git a/warnings.php b/warnings.php index a1e7ca7..fb25166 100644 --- a/warnings.php +++ b/warnings.php @@ -16,12 +16,13 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "player" => $page->get_avatar($player_name, $row['uuid']), - "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "reason" => $page->clean($row['reason']), - "expires" => $page->expiry($row), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "expires" => $page->expiry($row), "received-warning" => (($page->active($row, 'warned') === true) ? "1" : "0"), - "server.name" => $page->server($row), + "server.name" => $page->server($row), + "server.origin" => $page->server($row, "server_origin"), )); } $page->table_end();