Bring back "Banned By", "Muted By", etc messages.

This commit is contained in:
ruan 2018-04-19 18:18:12 +02:00
parent d265020738
commit 48e9b8856e
No known key found for this signature in database
GPG Key ID: 0D2EC1C52E469C0B
7 changed files with 61 additions and 35 deletions

View File

@ -16,12 +16,12 @@ foreach ($rows as $row) {
if ($player_name === null) continue; if ($player_name === null) continue;
$page->print_table_rows($row, array( $page->print_table_rows($row, array(
$page->t("table.player") => $page->get_avatar($player_name, $row['uuid']), "table.player" => $page->get_avatar($player_name, $row['uuid']),
$page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("table.reason") => $page->clean($row['reason']), "table.reason" => $page->clean($row['reason']),
$page->t("table.date") => $page->millis_to_date($row['time']), "table.date" => $page->millis_to_date($row['time']),
$page->t("table.expires") => $page->expiry($row), "table.expires" => $page->expiry($row),
$page->t("table.server.name") => $page->server($row), "table.server.name" => $page->server($row),
)); ));
} }
$page->table_end(); $page->table_end();

View File

@ -163,13 +163,13 @@ try {
$label = "<span class='badge litebans-label-history litebans-label-$label_type'>$label_name</span>"; $label = "<span class='badge litebans-label-history litebans-label-$label_type'>$label_name</span>";
$page->print_table_rows($row, array( $page->print_table_rows($row, array(
$page->t("generic.type") => $label, "generic.type" => $label,
$page->t("table.player") => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), "table.player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']),
$page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("table.reason") => $page->clean($row['reason']), "table.reason" => $page->clean($row['reason']),
$page->t("table.date") => $page->millis_to_date($row['time']), "table.date" => $page->millis_to_date($row['time']),
$page->t("table.expires") => $page->expiry($row), "table.expires" => $page->expiry($row),
$page->t("table.server.name") => $page->server($row), "table.server.name" => $page->server($row),
//'i' => $i . "/" . $limit . "/" . $total, //'i' => $i . "/" . $limit . "/" . $total,
)); ));
} }

View File

@ -59,6 +59,12 @@ class Page {
'warn' => $this->t("page.expired.warning"), 'warn' => $this->t("page.expired.warning"),
'kick' => null, 'kick' => null,
); );
$this->punished_by = array(
'ban' => $this->t("generic.banned.by"),
'mute' => $this->t("generic.muted.by"),
'warn' => $this->t("generic.warned.by"),
'kick' => $this->t("generic.kicked.by"),
);
if ($header) { if ($header) {
$h = new Header($this); $h = new Header($this);
@ -393,16 +399,25 @@ class Page {
} }
function print_table_rows($row, $array, $print_headers = true) { function print_table_rows($row, $array, $print_headers = true) {
$type = $this->type;
if (!$this->settings->show_server_scope) { if (!$this->settings->show_server_scope) {
unset($array[$this->t("table.server.name")]); unset($array["table.server.name"]);
} }
if ($print_headers && !$this->table_headers_printed) { if ($print_headers && !$this->table_headers_printed) {
$headers = array_keys($array); $headers = array_keys($array);
$this->table_print_headers($headers); $headers_translated = array();
foreach ($headers as $header) {
if ($header === "table.executor" && $this->name !== "history") {
$header = $this->punished_by[$type];
} else {
$header = $this->t($header);
}
array_push($headers_translated, $header);
}
$this->table_print_headers($headers_translated);
$this->table_headers_printed = true; $this->table_headers_printed = true;
} }
$id = $row['id']; $id = $row['id'];
$type = $this->type;
echo "<tr>"; echo "<tr>";
foreach ($array as $header => $text) { foreach ($array as $header => $text) {
$a = "a"; $a = "a";

View File

@ -16,11 +16,11 @@ foreach ($rows as $row) {
if ($player_name === null) continue; if ($player_name === null) continue;
$page->print_table_rows($row, array( $page->print_table_rows($row, array(
$page->t("table.player") => $page->get_avatar($player_name, $row['uuid']), "table.player" => $page->get_avatar($player_name, $row['uuid']),
$page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("table.reason") => $page->clean($row['reason']), "table.reason" => $page->clean($row['reason']),
$page->t("table.date") => $page->millis_to_date($row['time']), "table.date" => $page->millis_to_date($row['time']),
$page->t("table.server.name") => $page->server($row, "server_origin"), "table.server.name" => $page->server($row, "server_origin"),
)); ));
} }
$page->table_end(); $page->table_end();

View File

@ -23,10 +23,21 @@ class DefaultLang {
$array["generic.ban"] = "Ban"; $array["generic.ban"] = "Ban";
$array["generic.mute"] = "Mute"; $array["generic.mute"] = "Mute";
$array["generic.ipban"] = "IP " . $array["generic.ban"];
$array["generic.ipmute"] = "IP " . $array["generic.mute"];
$array["generic.warn"] = "Warning"; $array["generic.warn"] = "Warning";
$array["generic.kick"] = "Kick"; $array["generic.kick"] = "Kick";
$array["generic.banned"] = "Banned";
$array["generic.muted"] = "Muted";
$array["generic.warned"] = "Warned";
$array["generic.kicked"] = "Kicked";
$array["generic.banned.by"] = $array["generic.banned"] . " By";
$array["generic.muted.by"] = $array["generic.muted"] . " By";
$array["generic.warned.by"] = $array["generic.warned"] . " By";
$array["generic.kicked.by"] = $array["generic.kicked"] . " By";
$array["generic.ipban"] = "IP " . $array["generic.ban"];
$array["generic.ipmute"] = "IP " . $array["generic.mute"];
$array["generic.type"] = "Type"; $array["generic.type"] = "Type";
$array["generic.active"] = "Active"; $array["generic.active"] = "Active";
$array["generic.inactive"] = "Inactive"; $array["generic.inactive"] = "Inactive";

View File

@ -16,12 +16,12 @@ foreach ($rows as $row) {
if ($player_name === null) continue; if ($player_name === null) continue;
$page->print_table_rows($row, array( $page->print_table_rows($row, array(
$page->t("table.player") => $page->get_avatar($player_name, $row['uuid']), "table.player" => $page->get_avatar($player_name, $row['uuid']),
$page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("table.reason") => $page->clean($row['reason']), "table.reason" => $page->clean($row['reason']),
$page->t("table.date") => $page->millis_to_date($row['time']), "table.date" => $page->millis_to_date($row['time']),
$page->t("table.expires") => $page->expiry($row), "table.expires" => $page->expiry($row),
$page->t("table.server.name") => $page->server($row), "table.server.name" => $page->server($row),
)); ));
} }
$page->table_end(); $page->table_end();

View File

@ -16,12 +16,12 @@ foreach ($rows as $row) {
if ($player_name === null) continue; if ($player_name === null) continue;
$page->print_table_rows($row, array( $page->print_table_rows($row, array(
$page->t("table.player") => $page->get_avatar($player_name, $row['uuid']), "table.player" => $page->get_avatar($player_name, $row['uuid']),
$page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
$page->t("table.reason") => $page->clean($row['reason']), "table.reason" => $page->clean($row['reason']),
$page->t("table.expires") => $page->expiry($row), "table.expires" => $page->expiry($row),
$page->t("warnings.received") => (($page->active($row, 'warned') === true) ? "1" : "0"), "warnings.received" => (($page->active($row, 'warned') === true) ? "1" : "0"),
$page->t("table.server.name") => $page->server($row), "table.server.name" => $page->server($row),
)); ));
} }
$page->table_end(); $page->table_end();