More refactoring

This commit is contained in:
ruan 2018-04-26 07:59:12 +02:00
parent 09ca583c3f
commit 0f8ff13c43
No known key found for this signature in database
GPG Key ID: 0D2EC1C52E469C0B
15 changed files with 43 additions and 45 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(
"table.player" => $page->get_avatar($player_name, $row['uuid']), "player" => $page->get_avatar($player_name, $row['uuid']),
"table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
"table.reason" => $page->clean($row['reason']), "reason" => $page->clean($row['reason']),
"table.date" => $page->millis_to_date($row['time']), "date" => $page->millis_to_date($row['time']),
"table.expires" => $page->expiry($row), "expires" => $page->expiry($row),
"table.server.name" => $page->server($row), "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(
"generic.type" => $label, "type" => $label,
"table.player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), "player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']),
"table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
"table.reason" => $page->clean($row['reason']), "reason" => $page->clean($row['reason']),
"table.date" => $page->millis_to_date($row['time']), "date" => $page->millis_to_date($row['time']),
"table.expires" => $page->expiry($row), "expires" => $page->expiry($row),
"table.server.name" => $page->server($row), "server.name" => $page->server($row),
//'i' => $i . "/" . $limit . "/" . $total, //'i' => $i . "/" . $limit . "/" . $total,
)); ));
} }

View File

@ -15,7 +15,6 @@
} }
/* tables */ /* tables */
th { th {
text-align: center; text-align: center;
} }
@ -52,7 +51,6 @@ tr.hover {
} }
/* pager */ /* pager */
.litebans-pager { .litebans-pager {
font-size: 30px; font-size: 30px;
} }

View File

@ -401,16 +401,16 @@ class Page {
function print_table_rows($row, $array, $print_headers = true) { function print_table_rows($row, $array, $print_headers = true) {
$type = $this->type; $type = $this->type;
if (!$this->settings->show_server_scope) { if (!$this->settings->show_server_scope) {
unset($array["table.server.name"]); unset($array["server.name"]);
} }
if ($print_headers && !$this->table_headers_printed) { if ($print_headers && !$this->table_headers_printed) {
$headers = array_keys($array); $headers = array_keys($array);
$headers_translated = array(); $headers_translated = array();
foreach ($headers as $header) { foreach ($headers as $header) {
if ($header === "table.executor" && $this->name !== "history") { if ($header === "executor" && $this->name !== "history") {
$header = $this->punished_by[$type]; $header = $this->punished_by[$type];
} else { } else {
$header = $this->t($header); $header = $this->t("table." . $header);
} }
array_push($headers_translated, $header); array_push($headers_translated, $header);
} }
@ -421,7 +421,7 @@ class Page {
echo "<tr>"; echo "<tr>";
foreach ($array as $header => $text) { foreach ($array as $header => $text) {
$a = "a"; $a = "a";
if ($header === "warnings.received") { if ($header === "received-warning") {
$icon = ($text !== "0") ? "glyphicon-ok" : "glyphicon-remove"; $icon = ($text !== "0") ? "glyphicon-ok" : "glyphicon-remove";
$a .= " class=\"glyphicon $icon\" aria-hidden=true"; $a .= " class=\"glyphicon $icon\" aria-hidden=true";
$text = ""; $text = "";

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(
"table.player" => $page->get_avatar($player_name, $row['uuid']), "player" => $page->get_avatar($player_name, $row['uuid']),
"table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
"table.reason" => $page->clean($row['reason']), "reason" => $page->clean($row['reason']),
"table.date" => $page->millis_to_date($row['time']), "date" => $page->millis_to_date($row['time']),
"table.server.name" => $page->server($row, "server_origin"), "server.name" => $page->server($row, "server_origin"),
)); ));
} }
$page->table_end(); $page->table_end();

View File

@ -40,6 +40,6 @@ class Lang {
$array["info.error.id.invalid"] = "Neplatné ID"; $array["info.error.id.invalid"] = "Neplatné ID";
$array["info.error.id.no-result"] = "Chyba: "; $array["info.error.id.no-result"] = "Chyba: ";
$array["warnings.received"] = "Varování doručeno"; $array["table.received-warning"] = "Varování doručeno";
} }
} }

View File

@ -35,7 +35,7 @@ class Lang {
$array["history.error.uuid.no-result"] = "Ingen straf fundet."; $array["history.error.uuid.no-result"] = "Ingen straf fundet.";
$array["action.return"] = "Retuner til"; $array["action.return"] = "Retuner til";
$array["warnings.received"] = "Modtog Advarelse"; $array["table.received-warning"] = "Modtog Advarelse";
// Errors which are only accessible from invalid user input or removed pages. // Errors which are only accessible from invalid user input or removed pages.
$array["error.name.invalid"] = "Ugyldigt Navn."; $array["error.name.invalid"] = "Ugyldigt Navn.";

View File

@ -45,10 +45,12 @@ class DefaultLang {
$array["generic.player-name"] = "Player"; $array["generic.player-name"] = "Player";
$array["table.player"] = $array["generic.player-name"]; $array["table.player"] = $array["generic.player-name"];
$array["table.type"] = $array["generic.type"];
$array["table.executor"] = "Moderator"; $array["table.executor"] = "Moderator";
$array["table.reason"] = "Reason"; $array["table.reason"] = "Reason";
$array["table.date"] = "Date"; $array["table.date"] = "Date";
$array["table.expires"] = "Expires"; $array["table.expires"] = "Expires";
$array["table.received-warning"] = "Received Warning";
$array["table.server.name"] = "Server"; $array["table.server.name"] = "Server";
$array["table.server.scope"] = "Server Scope"; $array["table.server.scope"] = "Server Scope";
@ -59,8 +61,6 @@ class DefaultLang {
$array["action.check"] = "Check"; $array["action.check"] = "Check";
$array["action.return"] = "Return to {origin}"; $array["action.return"] = "Return to {origin}";
$array["warnings.received"] = "Received Warning";
$array["error.missing-args"] = "Missing arguments."; $array["error.missing-args"] = "Missing arguments.";
$array["error.name.unseen"] = "{name} has not joined before."; $array["error.name.unseen"] = "{name} has not joined before.";
$array["error.name.invalid"] = "Invalid name."; $array["error.name.invalid"] = "Invalid name.";

View File

@ -34,7 +34,7 @@ class Lang {
$array["history.error.uuid.no-result"] = "Castigos No Encontrados."; $array["history.error.uuid.no-result"] = "Castigos No Encontrados.";
$array["action.return"] = "Volver a"; $array["action.return"] = "Volver a";
$array["warnings.received"] = "¿Advertencia Recibida?"; $array["table.received-warning"] = "¿Advertencia Recibida?";
// Errors which are only accessible from invalid user input or removed pages. // Errors which are only accessible from invalid user input or removed pages.
$array["error.name.invalid"] = "Nombre Inválido."; $array["error.name.invalid"] = "Nombre Inválido.";

View File

@ -34,7 +34,7 @@ class Lang {
$array["history.error.uuid.no-result"] = "Sanciones no Encontradas."; $array["history.error.uuid.no-result"] = "Sanciones no Encontradas.";
$array["action.return"] = "Volver a"; $array["action.return"] = "Volver a";
$array["warnings.received"] = "¿Advertencia Recibida?"; $array["table.received-warning"] = "¿Advertencia Recibida?";
// Errors which are only accessible from invalid user input or removed pages. // Errors which are only accessible from invalid user input or removed pages.
$array["error.name.invalid"] = "Nombre Inválido."; $array["error.name.invalid"] = "Nombre Inválido.";

View File

@ -34,7 +34,7 @@ class Lang {
$array["history.error.uuid.no-result"] = "Nessuna punizione trovata."; $array["history.error.uuid.no-result"] = "Nessuna punizione trovata.";
$array["action.return"] = "Torna a"; $array["action.return"] = "Torna a";
$array["warnings.received"] = "Avvertimento ricevuto"; $array["table.received-warning"] = "Avvertimento ricevuto";
// Errors which are only accessible from invalid user input or removed pages. // Errors which are only accessible from invalid user input or removed pages.
$array["error.name.invalid"] = "Nome invalido."; $array["error.name.invalid"] = "Nome invalido.";

View File

@ -35,7 +35,7 @@ class Lang {
$array["history.error.uuid.no-result"] = "処罰データはありません"; $array["history.error.uuid.no-result"] = "処罰データはありません";
$array["action.return"] = "戻る"; $array["action.return"] = "戻る";
$array["warnings.received"] = "受け取った警告"; $array["table.received-warning"] = "受け取った警告";
// Errors which are only accessible from invalid user input or removed pages. // Errors which are only accessible from invalid user input or removed pages.
$array["error.name.invalid"] = "プレイヤー名が無効です"; $array["error.name.invalid"] = "プレイヤー名が無効です";

View File

@ -35,7 +35,7 @@ class Lang {
$array["history.error.uuid.no-result"] = "Geen straffen gevonden."; $array["history.error.uuid.no-result"] = "Geen straffen gevonden.";
$array["action.return"] = "Terug naar"; $array["action.return"] = "Terug naar";
$array["warnings.received"] = "Waarschuwing ontvangen"; $array["table.received-warning"] = "Waarschuwing ontvangen";
// Errors which are only accessible from invalid user input or removed pages. // Errors which are only accessible from invalid user input or removed pages.
$array["error.name.invalid"] = "Ongeldige naam."; $array["error.name.invalid"] = "Ongeldige naam.";

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(
"table.player" => $page->get_avatar($player_name, $row['uuid']), "player" => $page->get_avatar($player_name, $row['uuid']),
"table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
"table.reason" => $page->clean($row['reason']), "reason" => $page->clean($row['reason']),
"table.date" => $page->millis_to_date($row['time']), "date" => $page->millis_to_date($row['time']),
"table.expires" => $page->expiry($row), "expires" => $page->expiry($row),
"table.server.name" => $page->server($row), "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(
"table.player" => $page->get_avatar($player_name, $row['uuid']), "player" => $page->get_avatar($player_name, $row['uuid']),
"table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
"table.reason" => $page->clean($row['reason']), "reason" => $page->clean($row['reason']),
"table.expires" => $page->expiry($row), "expires" => $page->expiry($row),
"warnings.received" => (($page->active($row, 'warned') === true) ? "1" : "0"), "received-warning" => (($page->active($row, 'warned') === true) ? "1" : "0"),
"table.server.name" => $page->server($row), "server.name" => $page->server($row),
)); ));
} }
$page->table_end(); $page->table_end();