Add server scope column to all tables

This commit is contained in:
ruan 2017-12-04 06:53:05 +02:00
parent 260d6a67cc
commit bc233ad9d4
No known key found for this signature in database
GPG Key ID: 0D2EC1C52E469C0B
8 changed files with 36 additions and 14 deletions

View File

@ -16,11 +16,12 @@ foreach ($rows as $row) {
if ($player_name === null) continue;
$page->print_table_rows($row, array(
$page->t("bans_player") => $page->get_avatar($player_name, $row['uuid']),
$page->t("bans_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("bans_reason") => $page->clean($row['reason']),
$page->t("bans_when") => $page->millis_to_date($row['time']),
$page->t("bans_expiry") => $page->expiry($row),
$page->t("bans_player") => $page->get_avatar($player_name, $row['uuid']),
$page->t("bans_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("bans_reason") => $page->clean($row['reason']),
$page->t("bans_when") => $page->millis_to_date($row['time']),
$page->t("bans_expiry") => $page->expiry($row),
$page->t("column_server") => $page->server($row),
));
}
$page->table_end();

View File

@ -170,6 +170,7 @@ try {
$page->t("history_tablereason") => $page->clean($row['reason']),
$page->t("history_tabledate") => $page->millis_to_date($row['time']),
$page->t("history_tableexpires") => $page->expiry($row),
$page->t("column_server") => $page->server($row),
//'i' => $i . "/" . $limit . "/" . $total,
));
}

View File

@ -272,6 +272,16 @@ class Page {
return $text;
}
function server($row, $col = "server_scope") {
$server = $this->clean($row[$col]);
if ($server === null) {
return "-";
}
if ($server === "*") {
return $this->t("column_server_global");
}
return $server;
}
/**
* Returns a string that shows the expiry date of a punishment.

View File

@ -60,6 +60,7 @@ class BanInfo extends Info {
$page->t("info_banned_reason") => $page->clean($row['reason']),
$page->t("info_banned_when") => $page->millis_to_date($row['time']),
$page->t("info_banned_expiry") => $page->expiry($row),
$page->t("column_server") => $page->server($row),
);
}
}
@ -73,6 +74,7 @@ class MuteInfo extends Info {
$page->t("info_muted_reason") => $page->clean($row['reason']),
$page->t("info_muted_when") => $page->millis_to_date($row['time']),
$page->t("info_muted_expiry") => $page->expiry($row),
$page->t("column_server") => $page->server($row),
);
}
}
@ -90,6 +92,7 @@ class WarnInfo extends Info {
$page->t("info_warn_reason") => $page->clean($row['reason']),
$page->t("info_warn_when") => $page->millis_to_date($row['time']),
$page->t("info_warn_expiry") => $page->expiry($row),
$page->t("column_server") => $page->server($row),
);
}
}
@ -102,6 +105,7 @@ class KickInfo extends Info {
$page->t("info_kick_by") => $this->moderator_avatar($row),
$page->t("info_kick_reason") => $page->clean($row['reason']),
$page->t("info_kick_when") => $page->millis_to_date($row['time']),
$page->t("column_server") => $page->server($row),
);
}
}

View File

@ -16,10 +16,11 @@ foreach ($rows as $row) {
if ($player_name === null) continue;
$page->print_table_rows($row, array(
$page->t("kicks_player") => $page->get_avatar($player_name, $row['uuid']),
$page->t("kicks_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("kicks_reason") => $page->clean($row['reason']),
$page->t("kicks_when") => $page->millis_to_date($row['time']),
$page->t("kicks_player") => $page->get_avatar($player_name, $row['uuid']),
$page->t("kicks_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("kicks_reason") => $page->clean($row['reason']),
$page->t("kicks_when") => $page->millis_to_date($row['time']),
$page->t("column_server") => $page->server($row, "server_origin"),
));
}
$page->table_end();

View File

@ -86,6 +86,9 @@ class DefaultLang {
$array["warns_when"] = "Warned Until";
$array["warns_receive"] = "Received Warning";
$array["column_server"] = "Server";
$array["column_server_global"] = "*";
// Errors which are only accessible from invalid user input or removed pages.
$array["check_invalid"] = "Invalid name.";
$array["history_missinguuid"] = "Missing arguments (uuid).";

View File

@ -16,11 +16,12 @@ foreach ($rows as $row) {
if ($player_name === null) continue;
$page->print_table_rows($row, array(
$page->t("mutes_player") => $page->get_avatar($player_name, $row['uuid']),
$page->t("mutes_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("mutes_reason") => $page->clean($row['reason']),
$page->t("mutes_when") => $page->millis_to_date($row['time']),
$page->t("mutes_expiry") => $page->expiry($row),
$page->t("mutes_player") => $page->get_avatar($player_name, $row['uuid']),
$page->t("mutes_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("mutes_reason") => $page->clean($row['reason']),
$page->t("mutes_when") => $page->millis_to_date($row['time']),
$page->t("mutes_expiry") => $page->expiry($row),
$page->t("column_server") => $page->server($row),
));
}
$page->table_end();

View File

@ -21,6 +21,7 @@ foreach ($rows as $row) {
$page->t("warns_reason") => $page->clean($row['reason']),
$page->t("warns_when") => $page->expiry($row),
$page->t("warns_receive") => (($page->active($row, 'warned') === true) ? "1" : "0"),
$page->t("column_server") => $page->server($row),
));
}
$page->table_end();