Skip to content

Commit

Permalink
codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@bratkartoffel
bratkartoffel committed Feb 23, 2023
1 parent 62a2272 commit 40e89c0
Show file tree
Hide file tree
Showing 33 changed files with 705 additions and 697 deletions.
2 changes: 1 addition & 1 deletion actions/activate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
redirectTo('/?p=index', 117, __LINE__);
}
Database::getInstance()->commit();
redirectTo("/?p=anmelden", 241);
redirectTo('/?p=anmelden', 241);
6 changes: 3 additions & 3 deletions actions/admin_vertrag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
redirectTo(sprintf('Location: /?p=admin_vertrag_einstellen&von=%d&an=%d&ware=%d&menge=%d&preis=%F',
$von, $an, $ware, $menge, $preis), 141, __LINE__);
} else {
redirectTo("/?p=admin_vertrag", 218);
redirectTo('/?p=admin_vertrag', 218);
die();
}
break;
Expand All @@ -47,7 +47,7 @@
redirectTo(sprintf('Location: /?p=admin_vertrag_bearbeiten&id=%d&von=%d&an=%d&ware=%d&menge=%d&preis=%F',
$id, $an, $von, $ware, $menge, $preis), 142, __LINE__);
} else {
redirectTo("/?p=admin_vertrag", 234);
redirectTo('/?p=admin_vertrag', 234);
}
break;

Expand All @@ -57,7 +57,7 @@
if (Database::getInstance()->deleteTableEntry(Database::TABLE_CONTRACTS, $id) == 0) {
redirectBack('/?p=admin_vertrag', 143, __LINE__);
} else {
redirectTo("/?p=admin_vertrag", 233);
redirectTo('/?p=admin_vertrag', 233);
}
break;

Expand Down
5 changes: 2 additions & 3 deletions actions/einstellungen.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@

// Update profile picture
case 5:

Database::getInstance()->begin();
if (Database::getInstance()->updateTableEntry(Database::TABLE_USERS, $_SESSION['blm_user'], array('LastImageChange' => date('Y-m-d H:i:s'))) !== 1) {
Database::getInstance()->rollBack();
Expand Down Expand Up @@ -234,7 +233,7 @@
if ($zip->open($tmpFile, ZipArchive::OVERWRITE) !== true) {
redirectTo('/?p=einstellungen', 141, __LINE__);
}
$profilePicture = sprintf("../pics/uploads/u_%d.webp", $_SESSION['blm_user']);
$profilePicture = sprintf('../pics/uploads/u_%d.webp', $_SESSION['blm_user']);
if (file_exists($profilePicture) && $zip->addFile($profilePicture, 'profile.webp') !== true) {
redirectTo('/?p=einstellungen', 141, __LINE__);
}
Expand Down Expand Up @@ -278,7 +277,7 @@
echo file_get_contents($tmpFile);
break;

// unknown action
// unknown action
default:
redirectTo('/?p=einstellungen', 112, __LINE__);
break;
Expand Down
4 changes: 2 additions & 2 deletions actions/forschungszentrum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

Database::getInstance()->begin();
if (Database::getInstance()->createTableEntry(Database::TABLE_JOBS, array(
'finished' => date("Y-m-d H:i:s", time() + $researchData['Dauer']),
'finished' => date('Y-m-d H:i:s', time() + $researchData['Dauer']),
'user_id' => $_SESSION['blm_user'],
'item' => (job_type_factor * job_type_research) + $was,
'cost' => $researchData['Kosten']
Expand All @@ -57,4 +57,4 @@
}

Database::getInstance()->commit();
redirectTo('/?p=forschungszentrum', 207, "f" . $was);
redirectTo('/?p=forschungszentrum', 207, sprintf('f%s', $was));
4 changes: 2 additions & 2 deletions actions/gebaeude.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

Database::getInstance()->begin();
if (Database::getInstance()->createTableEntry(Database::TABLE_JOBS, array(
'finished' => date("Y-m-d H:i:s", time() + $buildingData['Dauer']),
'finished' => date('Y-m-d H:i:s', time() + $buildingData['Dauer']),
'user_id' => $_SESSION['blm_user'],
'item' => (job_type_factor * job_type_building) + $was,
'cost' => $buildingData['Kosten']
Expand All @@ -49,4 +49,4 @@
}

Database::getInstance()->commit();
redirectTo('/?p=gebaeude', 207, "g" . $was);
redirectTo('/?p=gebaeude', 207, sprintf('g%s', $was));
12 changes: 6 additions & 6 deletions actions/gruppe.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function pinMessage($id, $pinned)
}

Database::getInstance()->commit();
redirectTo('/?p=gruppe', 242, "GroupMessages");
redirectTo('/?p=gruppe', 242, 'GroupMessages');
}

switch (getOrDefault($_REQUEST, 'a', 0)) {
Expand Down Expand Up @@ -147,7 +147,7 @@ function pinMessage($id, $pinned)
if (passwordNeedsUpgrade($group['Passwort']) && Database::getInstance()->updateTableEntry(Database::TABLE_GROUP, $group['ID'],
array('Passwort' => hashPassword($pwd))) !== 1) {
Database::getInstance()->rollBack();
redirectTo(sprintf("/?p=gruppe&name=%s", urlencode($name)), 142, __LINE__);
redirectTo(sprintf('/?p=gruppe&name=%s', urlencode($name)), 142, __LINE__);
}
if (Database::getInstance()->updateTableEntry(Database::TABLE_USERS, $_SESSION['blm_user'],
array('Gruppe' => $group['ID']), array('Gruppe IS NULL')) !== 1) {
Expand Down Expand Up @@ -235,7 +235,7 @@ function pinMessage($id, $pinned)
case 4:
$message = getOrDefault($_POST, 'message');
if (strlen($message) < 4) {
redirectTo(sprintf('/?p=gruppe&message=%s', urlencode($message)), 128, "__LINE__");
redirectTo(sprintf('/?p=gruppe&message=%s', urlencode($message)), 128, __LINE__);
}

$player = Database::getInstance()->getPlayerNameAndGroupIdAndGroupRightsById($_SESSION['blm_user']);
Expand All @@ -254,7 +254,7 @@ function pinMessage($id, $pinned)
}

Database::getInstance()->commit();
redirectTo('/?p=gruppe', 204, "GroupMessages");
redirectTo('/?p=gruppe', 204, 'GroupMessages');
break;

// pin message
Expand Down Expand Up @@ -282,7 +282,7 @@ function pinMessage($id, $pinned)
}

Database::getInstance()->commit();
redirectTo('/?p=gruppe', 242, "GroupMessages");
redirectTo('/?p=gruppe', 242, 'GroupMessages');
break;

// ---------------------------------------------------------------------------------------
Expand Down Expand Up @@ -555,7 +555,7 @@ function pinMessage($id, $pinned)
}

Database::getInstance()->commit();
@unlink(sprintf("../pics/uploads/g_%d.webp", $player['Gruppe']));
@unlink(sprintf('../pics/uploads/g_%d.webp', $player['Gruppe']));
redirectTo('/?p=gruppe', 228, __LINE__);
break;

Expand Down
20 changes: 10 additions & 10 deletions actions/login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@

ob_start();

$name = requireEntryFound(getOrDefault($_POST, 'name'), "/?p=anmelden", 108, __LINE__);
$pwd = requireEntryFound(getOrDefault($_POST, 'pwd'), "/?p=anmelden", 108, __LINE__);
$name = requireEntryFound(getOrDefault($_POST, 'name'), '/?p=anmelden', 108, __LINE__);
$pwd = requireEntryFound(getOrDefault($_POST, 'pwd'), '/?p=anmelden', 108, __LINE__);

// force a new session
session_reset();
session_regenerate_id(true);

// load player data
$player = Database::getInstance()->getPlayerDataByName($name);
requireEntryFound($player, sprintf("/?p=anmelden&name=%s", urlencode($name)), 108, __LINE__);
requireEntryFound($player, sprintf('/?p=anmelden&name=%s', urlencode($name)), 108, __LINE__);

// check if game is locked
if (isGameLocked() && $player['Admin'] != 1) {
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 999, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 999, __LINE__);
}

if ($player['Gesperrt'] == 1) {
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 139, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 139, __LINE__);
}
if ($player['EMailAct'] !== null) {
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 135, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 135, __LINE__);
}

Database::getInstance()->begin();
Expand All @@ -49,19 +49,19 @@
'sitter' => 0
));
Database::getInstance()->commit();
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 108, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 108, __LINE__);
}

if (!$_SESSION['blm_sitter']) {
if (passwordNeedsUpgrade($player['user_password']) && Database::getInstance()->updateTableEntry(Database::TABLE_USERS, $player['ID'],
array('Passwort' => hashPassword($pwd))) !== 1) {
Database::getInstance()->rollBack();
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 142, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 142, __LINE__);
}
if (Database::getInstance()->updateTableEntry(Database::TABLE_USERS, $player['ID'],
array('LastLogin' => date('Y-m-d H:i:s'), 'LastAction' => date('Y-m-d H:i:s'))) !== 1) {
Database::getInstance()->rollBack();
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 142, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 142, __LINE__);
}
}

Expand All @@ -73,7 +73,7 @@
'sitter' => $_SESSION['blm_sitter'] ? 1 : 0
)) !== 1) {
Database::getInstance()->rollBack();
redirectTo(sprintf("/?p=anmelden&name=%s", urlencode($name)), 141, __LINE__);
redirectTo(sprintf('/?p=anmelden&name=%s', urlencode($name)), 141, __LINE__);
}

Database::getInstance()->commit();
Expand Down
2 changes: 1 addition & 1 deletion actions/mafia.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
redirectTo($backLink, 141, __LINE__);
}

$wares[] = sprintf("* %s: %s", getItemName($i), formatWeight($data['Lager' . $i]));
$wares[] = sprintf('* %s: %s', getItemName($i), formatWeight($data['Lager' . $i]));
}

if (Database::getInstance()->createTableEntry(Database::TABLE_MESSAGES, array(
Expand Down
6 changes: 3 additions & 3 deletions actions/marktplatz.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
'Von' => 0,
'An' => $entry['Von'],
'Betreff' => 'Angebot auf freiem Markt verkauft',
'Nachricht' => sprintf("Soeben wurde das Angebot #%d (%s %s zu insgesamt %s) von einem anonymen Käufer gekauft.",
'Nachricht' => sprintf('Soeben wurde das Angebot #%d (%s %s zu insgesamt %s) von einem anonymen Käufer gekauft.',
$entry['ID'], formatWeight($entry['Menge']), getItemName($entry['Was']), formatCurrency($amount))
)) != 1) {
Database::getInstance()->rollBack();
Expand Down Expand Up @@ -155,8 +155,8 @@
'Von' => 0,
'An' => $entry['Von'],
'Betreff' => 'Angebot vom freien Markt zurückgezogen',
'Nachricht' => sprintf("Das Angebot #%d wurde vom Markt zurückgezogen. Leider sind auf dem Transport und während der Lagerung dort ein Teil der Waren verdorben.
Von den ursprünglichen %s konnten %s wieder in ihr Lager übernommen werden.",
'Nachricht' => sprintf('Das Angebot #%d wurde vom Markt zurückgezogen. Leider sind auf dem Transport und während der Lagerung dort ein Teil der Waren verdorben.
Von den ursprünglichen %s konnten %s wieder in ihr Lager übernommen werden.',
$entry['ID'], formatWeight($entry['Menge']), formatWeight(floor($entry['Menge'] * Config::getFloat(Config::SECTION_MARKET, 'retract_rate'))))
)) != 1) {
Database::getInstance()->rollBack();
Expand Down
4 changes: 2 additions & 2 deletions actions/plantage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
Database::getInstance()->begin();

if (Database::getInstance()->createTableEntry(Database::TABLE_JOBS, array(
'finished' => date("Y-m-d H:i:s", time() + $stunden * 3600),
'finished' => date('Y-m-d H:i:s', time() + $stunden * 3600),
'user_id' => $_SESSION['blm_user'],
'item' => (job_type_factor * job_type_production) + $was,
'amount' => $menge,
Expand All @@ -104,4 +104,4 @@
}

Database::getInstance()->commit();
redirectTo('/?p=plantage', 207, "p" . $was);
redirectTo('/?p=plantage', 207, sprintf('p%s', $was));
2 changes: 1 addition & 1 deletion actions/pwd_reset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function sendPasswordMail(string $email, string $name, string $password): bool
if (strtotime($request['created']) < time() - (3600 * 4)) {
Database::getInstance()->begin();
if (Database::getInstance()->updateTableEntry(Database::TABLE_PASSWORD_RESET, $request['ID'],
array('created' => date("Y-m-d H:i:s"))) !== 1) {
array('created' => date('Y-m-d H:i:s'))) !== 1) {
Database::getInstance()->rollBack();
redirectTo($back_link, 142, __LINE__);
}
Expand Down
2 changes: 1 addition & 1 deletion chefbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
$dauer = 1000 * (microtime(true) - $start);
?>
<!--
PLT: <?= number_format($dauer, 2) . "ms\n"; ?>
PLT: <?= number_format($dauer, 2); ?>ms
Queries: <?= $database->getQueryCount() . "\n"; ?>
<?php
$warnings = $database->getWarnings();
Expand Down
6 changes: 3 additions & 3 deletions cronjobs/cron.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
$database = Database::getInstance();

if (isGameLocked()) {
die(sprintf("Game is currently locked (%d < %d)\n", time(), Config::getInt(Config::SECTION_DBCONF, 'roundstart')));
die(sprintf('Game is currently locked (%d < %d)' . "\n", time(), Config::getInt(Config::SECTION_DBCONF, 'roundstart')));
}

if (isRoundOver()) {
handleRoundEnd();
die("Game reset completed!\n");
die('Game reset completed!' . "\n");
}

function CheckAllAuftraege(Database $database): void
Expand Down Expand Up @@ -94,7 +94,7 @@ function handleResetDueToDispo(Database $database): void
'Von' => 0,
'An' => $entry['ID'],
'Betreff' => 'Account zurückgesetzt',
'Nachricht' => "Nachdem Ihr Kontostand unter " . formatCurrency($limit) . " gefallen ist wurden Sie gezwungen, Insolvenz anzumelden. Sie haben sich an der Grenze zu Absurdistan einen neuen Pass geholt und versuchen Ihr Glück mit einer neuen Identität nochmal neu"
'Nachricht' => sprintf('Nachdem Ihr Kontostand unter %s gefallen ist wurden Sie gezwungen, Insolvenz anzumelden. Sie haben sich an der Grenze zu Absurdistan einen neuen Pass geholt und versuchen Ihr Glück mit einer neuen Identität nochmal neu', formatCurrency($limit))
)) != 1) {
$database->rollBack();
error_log(sprintf('Could create message after resetting player %d', $entry['ID']));
Expand Down
2 changes: 1 addition & 1 deletion include/captcha.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function createCaptcha(): void

public function getImageUrl(): string
{
return sprintf("data:image/webp;base64,%s", base64_encode($this->imageData));
return sprintf('data:image/webp;base64,%s', base64_encode($this->imageData));
}

public function getId(): string
Expand Down
8 changes: 4 additions & 4 deletions include/config.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static function getSection(string $section): array
$result = self::getInstance()->_get($section, null);
if ($section === self::SECTION_STARTING_VALUES) {
foreach ($result as $key => $value) {
if ($value === "null" || $value === "") {
if ($value === 'null' || $value === '') {
$result[$key] = null;
}
}
Expand All @@ -88,9 +88,9 @@ public static function getFloat(string $section, string $option): float
public static function getBoolean(string $section, string $option): bool
{
switch (self::get($section, $option)) {
case "1":
case "yes":
case "true":
case '1':
case 'yes':
case 'true':
return true;
default:
return false;
Expand Down
Loading

0 comments on commit 40e89c0

Please sign in to comment.