mirror/litebans-php
1
0
Fork 0
mirror of https://gitlab.com/ruany/litebans-php.git synced 2025-05-23 16:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Spring cleaning

Browse Source
This commit is contained in:
ruan 2018-07-21 12:51:35 +02:00
parent d54715a9ac
commit c4afc1399f
No known key found for this signature in database
GPG Key ID: 0D2EC1C52E469C0B
3 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
history.php
View File

@ -204,7 +204,6 @@ try {
"date" => $page->millis_to_date($row['time']), "date" => $page->millis_to_date($row['time']),
"expires" => $page->expiry($row), "expires" => $page->expiry($row),
"server.name" => $page->server($row), "server.name" => $page->server($row),
//'i' => $i . "/" . $limit . "/" . $total,
)); ));
} }

46
inc/page.php
View File

@ -168,7 +168,7 @@ class Page {
} }
} }
function get_selection($table, $fatquery = null, $phpIsBroken = true) { function get_selection($table, $phpIsBroken = true) {
$columns = array("id", "uuid", "reason", "banned_by_name", "banned_by_uuid", "time", "until", "server_origin", "server_scope", "active", "ipban"); $columns = array("id", "uuid", "reason", "banned_by_name", "banned_by_uuid", "time", "until", "server_origin", "server_scope", "active", "ipban");
$bitColumns = array("active", "ipban"); $bitColumns = array("active", "ipban");
@ -186,29 +186,12 @@ class Page {
// Workaround: cast to unsigned. // Workaround: cast to unsigned.
if ($phpIsBroken === true) { if ($phpIsBroken === true) {
foreach ($bitColumns as $column) { foreach ($bitColumns as $column) {
unset($columns[$column]); unset($columns[$column]);
$alias = $column; $alias = $column;
// if ($fatquery !== null) { array_push($columns, "CAST($column AS UNSIGNED) AS $alias");
// $alias = "$fatquery.$column";
// }
array_push($columns, "CAST($column AS UNSIGNED) AS $alias");
} }
} }
// is there really no better way to do this?
// if ($fatquery !== null) {
// foreach ($columns as $column) {
// if (!array_key_exists($column, $bitColumns)) {
// unset($columns[$column]);
// array_push($columns, "$column AS $fatquery.$column");
// }
// }
// }
$selection = implode(",", $columns); $selection = implode(",", $columns);
// echo $selection;
return $selection; return $selection;
} }
@ -408,24 +391,17 @@ class Page {
$time = gettimeofday(); $time = gettimeofday();
$millis = $time["sec"] * 1000; $millis = $time["sec"] * 1000;
// $dtz = new DateTimeZone(date_default_timezone_get());
// $dt = new DateTime("now", $dtz);
// $millis = ($dt->getTimestamp() + $dt->getOffset()) * 1000;
if ($millis > $until) { return ($millis > $until);
return true;
}
return false;
} }
function print_title() { function print_title() {
$title = $this->title; $title = $this->title;
$name = $this->settings->name; $name = $this->settings->name;
if ($title === null) { if ($title !== null) {
echo "<title>$name</title>"; $name = "$title - $name";
} else {
echo "<title>$title - $name</title>";
} }
echo "<title>$name</title>";
} }
function print_table_rows($row, $array, $print_headers = true) { function print_table_rows($row, $array, $print_headers = true) {
@ -440,7 +416,7 @@ class Page {
if ($header === "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("table." . $header); $header = $this->t("table.$header");
} }
array_push($headers_translated, $header); array_push($headers_translated, $header);
} }
@ -548,7 +524,7 @@ class Page {
} }
function autoversion($file) { function autoversion($file) {
return $file . "?" . filemtime($file); return "$file?" . filemtime($file);
} }
function table_begin() { function table_begin() {
@ -578,7 +554,7 @@ class Page {
*/ */
public function where_append($where) { public function where_append($where) {
if ($where !== "") { if ($where !== "") {
return $where . " AND "; return "$where AND ";
} else { } else {
return "WHERE "; return "WHERE ";
} }

6
inc/settings.php
View File

@ -234,7 +234,7 @@ final class Settings {
if ($settings->error_reporting === false) { if ($settings->error_reporting === false) {
die("Database error"); die("Database error");
} }
die('Database error: ' . $message); die("Database error: $message");
} }
@ -256,7 +256,7 @@ final class Settings {
ob_start(); ob_start();
var_dump($test); var_dump($test);
$testdump = ob_get_clean(); $testdump = ob_get_clean();
echo("Error: date_format test failed. gmstrftime(\"" . $this->date_format . "\",0) returned " . $testdump); echo("Error: date_format test failed. gmstrftime(\"" . $this->date_format . "\",0) returned $testdump");
$fail = true; $fail = true;
} }
@ -266,7 +266,7 @@ final class Settings {
var_dump($test); var_dump($test);
$testdump = ob_get_clean(); $testdump = ob_get_clean();
echo("Assertion failed: gmstrftime(\"%Y-%m-%d %H:%M\",0) != \"1970-01-01 00:00\"<br>"); echo("Assertion failed: gmstrftime(\"%Y-%m-%d %H:%M\",0) != \"1970-01-01 00:00\"<br>");
echo("Actual result: " . $testdump); echo("Actual result: $testdump");
$fail = true; $fail = true;
} }