diff --git a/actions/activate.php b/actions/activate.php
index 08e416d4..9db7969b 100644
--- a/actions/activate.php
+++ b/actions/activate.php
@@ -22,4 +22,4 @@
     redirectTo('/?p=index', 117, __LINE__);
 }
 Database::getInstance()->commit();
-redirectTo("/?p=anmelden", 241);
+redirectTo('/?p=anmelden', 241);
diff --git a/actions/admin_vertrag.php b/actions/admin_vertrag.php
index 104762d5..17944bcf 100644
--- a/actions/admin_vertrag.php
+++ b/actions/admin_vertrag.php
@@ -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;
@@ -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;
 
@@ -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;
 
diff --git a/actions/einstellungen.php b/actions/einstellungen.php
index 2840b53d..7fe4bcd4 100644
--- a/actions/einstellungen.php
+++ b/actions/einstellungen.php
@@ -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();
@@ -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__);
         }
@@ -278,7 +277,7 @@
         echo file_get_contents($tmpFile);
         break;
 
-// unknown action
+    // unknown action
     default:
         redirectTo('/?p=einstellungen', 112, __LINE__);
         break;
diff --git a/actions/forschungszentrum.php b/actions/forschungszentrum.php
index 3a0ec49b..fc0db494 100644
--- a/actions/forschungszentrum.php
+++ b/actions/forschungszentrum.php
@@ -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']
@@ -57,4 +57,4 @@
 }
 
 Database::getInstance()->commit();
-redirectTo('/?p=forschungszentrum', 207, "f" . $was);
+redirectTo('/?p=forschungszentrum', 207, sprintf('f%s', $was));
diff --git a/actions/gebaeude.php b/actions/gebaeude.php
index 5461dca7..f5b54f1d 100644
--- a/actions/gebaeude.php
+++ b/actions/gebaeude.php
@@ -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']
@@ -49,4 +49,4 @@
 }
 
 Database::getInstance()->commit();
-redirectTo('/?p=gebaeude', 207, "g" . $was);
+redirectTo('/?p=gebaeude', 207, sprintf('g%s', $was));
diff --git a/actions/gruppe.php b/actions/gruppe.php
index 88d73342..da24f615 100644
--- a/actions/gruppe.php
+++ b/actions/gruppe.php
@@ -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)) {
@@ -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) {
@@ -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']);
@@ -254,7 +254,7 @@ function pinMessage($id, $pinned)
         }
 
         Database::getInstance()->commit();
-        redirectTo('/?p=gruppe', 204, "GroupMessages");
+        redirectTo('/?p=gruppe', 204, 'GroupMessages');
         break;
 
     // pin message
@@ -282,7 +282,7 @@ function pinMessage($id, $pinned)
         }
 
         Database::getInstance()->commit();
-        redirectTo('/?p=gruppe', 242, "GroupMessages");
+        redirectTo('/?p=gruppe', 242, 'GroupMessages');
         break;
 
     // ---------------------------------------------------------------------------------------
@@ -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;
 
diff --git a/actions/login.php b/actions/login.php
index 965a827b..40755446 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -10,8 +10,8 @@
 
 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();
@@ -19,18 +19,18 @@
 
 // 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();
@@ -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__);
     }
 }
 
@@ -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();
diff --git a/actions/mafia.php b/actions/mafia.php
index 5860b06f..d1bdd58b 100644
--- a/actions/mafia.php
+++ b/actions/mafia.php
@@ -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(
diff --git a/actions/marktplatz.php b/actions/marktplatz.php
index 54efd414..50e38cff 100644
--- a/actions/marktplatz.php
+++ b/actions/marktplatz.php
@@ -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();
@@ -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();
diff --git a/actions/plantage.php b/actions/plantage.php
index 872e609a..cfee4b0d 100644
--- a/actions/plantage.php
+++ b/actions/plantage.php
@@ -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,
@@ -104,4 +104,4 @@
 }
 
 Database::getInstance()->commit();
-redirectTo('/?p=plantage', 207, "p" . $was);
+redirectTo('/?p=plantage', 207, sprintf('p%s', $was));
diff --git a/actions/pwd_reset.php b/actions/pwd_reset.php
index 9560fb54..725e6a97 100644
--- a/actions/pwd_reset.php
+++ b/actions/pwd_reset.php
@@ -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__);
                 }
diff --git a/chefbox.php b/chefbox.php
index f6a2642a..3da9e001 100644
--- a/chefbox.php
+++ b/chefbox.php
@@ -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();
diff --git a/cronjobs/cron.php b/cronjobs/cron.php
index a2ac7eac..0c099f46 100644
--- a/cronjobs/cron.php
+++ b/cronjobs/cron.php
@@ -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
@@ -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']));
diff --git a/include/captcha.class.php b/include/captcha.class.php
index 09a8baed..64c26b07 100644
--- a/include/captcha.class.php
+++ b/include/captcha.class.php
@@ -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
diff --git a/include/config.class.php b/include/config.class.php
index b54a9650..6be61166 100644
--- a/include/config.class.php
+++ b/include/config.class.php
@@ -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;
                 }
             }
@@ -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;
diff --git a/include/database.class.php b/include/database.class.php
index d299c0a2..9e788537 100644
--- a/include/database.class.php
+++ b/include/database.class.php
@@ -76,7 +76,7 @@ function __construct(bool $dieOnInitError)
             $this->slow_query_threshold = Config::getFloat(Config::SECTION_DATABASE, 'slow_query_threshold') / 1000;
 
             // load runtime configuration
-            $stmt = $this->prepare("SELECT conf_name, conf_value FROM " . self::TABLE_RUNTIME_CONFIG);
+            $stmt = $this->prepare('SELECT conf_name, conf_value FROM ' . self::TABLE_RUNTIME_CONFIG);
             @Config::enhanceFromDb($this->executeAndExtractRows($stmt));
         } catch (PDOException $e) {
             if ($dieOnInitError) {
@@ -132,7 +132,7 @@ public function createTableEntry(string $table, array $values = array()): ?int
             $columnParameters[] = ':' . $field;
         }
 
-        $stmt = $this->prepare(sprintf("INSERT INTO %s (%s) VALUES (%s)", $table, implode(", ", $columnNames), implode(", ", $columnParameters)));
+        $stmt = $this->prepare(sprintf('INSERT INTO %s (%s) VALUES (%s)', $table, implode(', ', $columnNames), implode(', ', $columnParameters)));
         return $this->executeAndGetAffectedRows($stmt, $values);
     }
 
@@ -145,7 +145,7 @@ public function existsTableEntry(string $table, array $wheres = array()): bool
             $conditions[] = sprintf('%s = :whr%d', $field, ++$i);
             $fields['whr' . $i] = $value;
         }
-        $sql = sprintf("SELECT 1 AS found WHERE EXISTS(SELECT 1 FROM %s WHERE %s)", $table, implode(" AND ", $conditions));
+        $sql = sprintf('SELECT 1 AS found WHERE EXISTS(SELECT 1 FROM %s WHERE %s)', $table, implode(' AND ', $conditions));
         return $this->executeAndExtractField($this->prepare($sql), 'found', $fields) !== null;
     }
 
@@ -154,27 +154,27 @@ public function updateTableEntry(string $table, ?int $id, array $changes = array
         $fields = array();
         foreach ($changes as $field => $value) {
             if ($value === null) {
-                $fields[] = sprintf("%s = NULL", $field);
+                $fields[] = sprintf('%s = NULL', $field);
                 unset($changes[$field]);
             } else {
-                $fields[] = sprintf("%s = :%s", $field, $field);
+                $fields[] = sprintf('%s = :%s', $field, $field);
             }
         }
         $wheres = array();
         $i = 0;
         foreach ($additionWhere as $cond => $value) {
             if (is_int($cond)) {
-                $wheres[] = sprintf(" AND %s", $value);
+                $wheres[] = sprintf(' AND %s', $value);
             } else {
-                $wheres[] = sprintf(" AND %s", $cond);
+                $wheres[] = sprintf(' AND %s', $cond);
                 $changes['whr' . $i++] = $value;
             }
         }
         if ($id != null) {
-            $stmt = $this->prepare(sprintf("UPDATE %s SET %s WHERE ID = :id%s", $table, implode(", ", $fields), implode(" ", $wheres)));
+            $stmt = $this->prepare(sprintf('UPDATE %s SET %s WHERE ID = :id%s', $table, implode(', ', $fields), implode(' ', $wheres)));
             $changes['id'] = $id;
         } else {
-            $stmt = $this->prepare(sprintf("UPDATE %s SET %s WHERE 1=1%s", $table, implode(", ", $fields), implode(" ", $wheres)));
+            $stmt = $this->prepare(sprintf('UPDATE %s SET %s WHERE 1=1%s', $table, implode(', ', $fields), implode(' ', $wheres)));
         }
         return $this->executeAndGetAffectedRows($stmt, $changes);
     }
@@ -183,7 +183,7 @@ public function updateTableEntryCalculate(string $table, ?int $id, array $change
     {
         $fields = array();
         foreach ($changes as $field => $value) {
-            $fields[] = sprintf("%s = %s + :%s", $field, $field, $field);
+            $fields[] = sprintf('%s = %s + :%s', $field, $field, $field);
         }
         $wheres = array();
         $i = 0;
@@ -195,10 +195,10 @@ public function updateTableEntryCalculate(string $table, ?int $id, array $change
             $wheres[] = '1=1';
         }
         if ($id !== null) {
-            $stmt = $this->prepare(sprintf("UPDATE %s SET %s WHERE ID = :id AND %s", $table, implode(", ", $fields), implode(" AND ", $wheres)));
+            $stmt = $this->prepare(sprintf('UPDATE %s SET %s WHERE ID = :id AND %s', $table, implode(', ', $fields), implode(' AND ', $wheres)));
             $changes['id'] = $id;
         } else {
-            $stmt = $this->prepare(sprintf("UPDATE %s SET %s WHERE %s", $table, implode(", ", $fields), implode(" AND ", $wheres)));
+            $stmt = $this->prepare(sprintf('UPDATE %s SET %s WHERE %s', $table, implode(', ', $fields), implode(' AND ', $wheres)));
         }
         return $this->executeAndGetAffectedRows($stmt, $changes);
     }
@@ -212,9 +212,9 @@ public function deleteTableEntryWhere(string $table, array $wheres): ?int
     {
         $where = array();
         foreach ($wheres as $cond => $value) {
-            $where[] = sprintf("%s = :%s", $cond, $cond);
+            $where[] = sprintf('%s = :%s', $cond, $cond);
         }
-        $stmt = $this->prepare(sprintf("DELETE FROM %s WHERE " . implode(" AND ", $where), $table));
+        $stmt = $this->prepare(sprintf('DELETE FROM %s WHERE ' . implode(' AND ', $where), $table));
         $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndGetAffectedRows($stmt, $wheres);
     }
@@ -222,14 +222,14 @@ public function deleteTableEntryWhere(string $table, array $wheres): ?int
     public function truncateTables(array $tables): ?string
     {
         foreach ($tables as $table) {
-            $stmt = $this->prepare(sprintf("DELETE FROM %s WHERE 1", $table));
+            $stmt = $this->prepare(sprintf('DELETE FROM %s WHERE 1', $table));
             $status = $this->executeAndGetAffectedRows($stmt);
             if ($status === null) {
                 return $table;
             }
         }
         foreach ($tables as $table) {
-            $stmt = $this->prepare(sprintf("ALTER TABLE %s AUTO_INCREMENT 1;", $table));
+            $stmt = $this->prepare(sprintf('ALTER TABLE %s AUTO_INCREMENT 1;', $table));
             $status = $this->executeAndGetAffectedRows($stmt);
             if ($status === null) {
                 return $table;
@@ -243,93 +243,93 @@ public function getPlayerNameById(int $id): ?string
         if ($id === 0) {
             return 'System';
         }
-        $stmt = $this->prepare("SELECT Name FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Name FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'Name');
     }
 
     public function getPlayerAndSitterPasswordsById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT m.Passwort AS 'Benutzer', s.Passwort as 'Sitter'
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_SITTER . " s ON m.ID = s.user_id
+        $stmt = $this->prepare('SELECT m.Passwort AS Benutzer, s.Passwort as Sitter
+            FROM ' . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_SITTER . ' s ON m.ID = s.user_id
             WHERE m.ID = :id
-            AND m.ID > 0");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+            AND m.ID > 0');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getAuftragByIdAndVon(int $id, int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_JOBS . " WHERE ID = :id AND user_id = :user");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
-        $stmt->bindParam("user", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_JOBS . ' WHERE ID = :id AND user_id = :user');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
+        $stmt->bindParam('user', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerIdByNameOrEmailAndActivationToken(?string $name, ?string $email, string $code): ?int
     {
-        $stmt = $this->prepare("SELECT ID FROM " . self::TABLE_USERS . " WHERE ID > 0 AND (Name = :name OR EMail = :email) AND EMailAct = :code");
-        $stmt->bindParam("name", $name);
-        $stmt->bindParam("email", $email);
-        $stmt->bindParam("code", $code);
+        $stmt = $this->prepare('SELECT ID FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND (Name = :name OR EMail = :email) AND EMailAct = :code');
+        $stmt->bindParam('name', $name);
+        $stmt->bindParam('email', $email);
+        $stmt->bindParam('code', $code);
         return $this->executeAndExtractField($stmt, 'ID');
     }
 
     public function getPasswordRequestByUserId(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_PASSWORD_RESET . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_PASSWORD_RESET . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerIdAndNameByEmail(string $email): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name FROM " . self::TABLE_USERS . " WHERE ID > 0 AND EMail = :email");
-        $stmt->bindParam("email", $email);
+        $stmt = $this->prepare('SELECT ID, Name FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND EMail = :email');
+        $stmt->bindParam('email', $email);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerNameAndEmailById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT Name, EMail FROM " . self::TABLE_USERS . " WHERE ID > 0 AND ID = :id");
-        $stmt->bindParam("id", $id);
+        $stmt = $this->prepare('SELECT Name, EMail FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND ID = :id');
+        $stmt->bindParam('id', $id);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerRankById(int $id): ?int
     {
-        $stmt = $this->prepare("with stats as (
-                SELECT ROW_NUMBER() OVER (ORDER BY Punkte DESC, ID) AS rnum, ID, Punkte FROM " . self::TABLE_USERS . " WHERE ID > 0 AND EmailAct IS NULL
-            ) select * from stats where ID = :id");
-        $stmt->bindParam("id", $id);
+        $stmt = $this->prepare('with stats as (
+                SELECT ROW_NUMBER() OVER (ORDER BY Punkte DESC, ID) AS rnum, ID, Punkte FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND EmailAct IS NULL
+            ) select * from stats where ID = :id');
+        $stmt->bindParam('id', $id);
         return $this->executeAndExtractField($stmt, 'rnum');
     }
 
     public function getPlayerRankByName(string $name): ?int
     {
-        $stmt = $this->prepare("with stats as (
-                SELECT ROW_NUMBER() OVER (ORDER BY Punkte DESC, ID) AS rnum, ID, Name, Punkte FROM " . self::TABLE_USERS . " WHERE ID > 0 AND EmailAct IS NULL
-            ) select * from stats where Name = :name");
-        $stmt->bindParam("name", $name);
+        $stmt = $this->prepare('with stats as (
+                SELECT ROW_NUMBER() OVER (ORDER BY Punkte DESC, ID) AS rnum, ID, Name, Punkte FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND EmailAct IS NULL
+            ) select * from stats where Name = :name');
+        $stmt->bindParam('name', $name);
         return $this->executeAndExtractField($stmt, 'rnum');
     }
 
     public function getPlayerPointsAndNameAndMoneyAndGruppeAndZaunById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, Punkte, Geld, Gruppe, Gebaeude7 FROM " . self::TABLE_USERS . " WHERE ID = :id AND ID > 0");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name, Punkte, Geld, Gruppe, Gebaeude7 FROM ' . self::TABLE_USERS . ' WHERE ID = :id AND ID > 0');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerCount(): ?int
     {
-        return $this->executeAndExtractField($this->prepare("SELECT count(1) AS count FROM " . self::TABLE_USERS . " WHERE ID > 0"), 'count');
+        return $this->executeAndExtractField($this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_USERS . ' WHERE ID > 0'), 'count');
     }
 
     public function getAllMessagesByAnCount(int $blm_user): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_MESSAGES . " WHERE An = :id ORDER BY Zeit DESC");
-        $stmt->bindParam("id", $blm_user);
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_MESSAGES . ' WHERE An = :id ORDER BY Zeit DESC');
+        $stmt->bindParam('id', $blm_user);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
@@ -337,18 +337,18 @@ public function getAllMessagesByAnEntries(int $blm_user, string $page, string $e
     {
         $offset = $page * $entriesPerPage;
         $stmt = $this->prepare("SELECT n.*, m.ID AS VonID, coalesce(m.Name, 'Gelöscht') AS VonName
-            FROM " . self::TABLE_MESSAGES . " n LEFT OUTER JOIN " . self::TABLE_USERS . " m ON n.Von = m.ID
-            WHERE n.An = :id ORDER BY n.Zeit DESC LIMIT :offset, :count");
-        $stmt->bindParam("id", $blm_user);
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+            FROM " . self::TABLE_MESSAGES . ' n LEFT OUTER JOIN ' . self::TABLE_USERS . ' m ON n.Von = m.ID
+            WHERE n.An = :id ORDER BY n.Zeit DESC LIMIT :offset, :count');
+        $stmt->bindParam('id', $blm_user);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllMessagesByVonCount(int $blm_user): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_MESSAGES . " WHERE Von = :id ORDER BY Zeit DESC");
-        $stmt->bindParam("id", $blm_user);
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_MESSAGES . ' WHERE Von = :id ORDER BY Zeit DESC');
+        $stmt->bindParam('id', $blm_user);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
@@ -356,33 +356,33 @@ public function getAllMessagesByVonEntries(int $blm_user, int $page, int $entrie
     {
         $offset = $page * $entriesPerPage;
         $stmt = $this->prepare("SELECT n.*, m.ID AS AnID, coalesce(m.Name, 'Gelöscht') AS AnName
-            FROM " . self::TABLE_MESSAGES . " n LEFT OUTER JOIN " . self::TABLE_USERS . " m ON n.An = m.ID
-            WHERE n.Von = :id ORDER BY n.Zeit DESC LIMIT :offset, :count");
-        $stmt->bindParam("id", $blm_user);
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+            FROM " . self::TABLE_MESSAGES . ' n LEFT OUTER JOIN ' . self::TABLE_USERS . ' m ON n.An = m.ID
+            WHERE n.Von = :id ORDER BY n.Zeit DESC LIMIT :offset, :count');
+        $stmt->bindParam('id', $blm_user);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getRanglisteUserEntries(int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepare("SELECT m.Name AS BenutzerName, m.ID AS BenutzerID, m.LastAction, 
+        $stmt = $this->prepare('SELECT m.Name AS BenutzerName, m.ID AS BenutzerID, m.LastAction, 
                 m.Admin AS IstAdmin, m.Betatester AS IstBetatester, m.Punkte, g.Kuerzel AS GruppeName, m.Gruppe AS GruppeID
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_GROUP . " g ON m.Gruppe = g.ID
-            WHERE m.ID > 0 AND m.EmailAct IS NULL ORDER BY m.Punkte DESC, m.ID LIMIT :offset, :count");
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+            FROM ' . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_GROUP . ' g ON m.Gruppe = g.ID
+            WHERE m.ID > 0 AND m.EmailAct IS NULL ORDER BY m.Punkte DESC, m.ID LIMIT :offset, :count');
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getEwigePunkteEntries(int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepare("SELECT ID, Name, EwigePunkte
-            FROM " . self::TABLE_USERS . " WHERE EwigePunkte > 0 ORDER BY EwigePunkte DESC, ID LIMIT :offset, :count");
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name, EwigePunkte
+            FROM ' . self::TABLE_USERS . ' WHERE EwigePunkte > 0 ORDER BY EwigePunkte DESC, ID LIMIT :offset, :count');
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
@@ -391,32 +391,32 @@ public function getRanglisteGroupEntries(int $page, int $entriesPerPage): ?array
         $offset = $page * $entriesPerPage;
         $stmt = $this->prepare("WITH stats AS (
     SELECT m.Gruppe AS GruppeID, SUM(m.Punkte) AS Punkte, COUNT(1) AS AnzMitglieder, CONCAT(';', GROUP_CONCAT(m.ID SEPARATOR ';'), ';') AS Mitglieder
-    FROM " . self::TABLE_USERS . " m
+    FROM " . self::TABLE_USERS . ' m
     WHERE Gruppe IS NOT NULL
     GROUP BY m.Gruppe
 )
-SELECT s.*, g.Kuerzel AS GruppeKuerzel, g.Name AS GruppeName FROM stats s INNER JOIN " . self::TABLE_GROUP . " g ON s.GruppeID = g.ID ORDER BY s.Punkte DESC, AnzMitglieder LIMIT :offset, :count");
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+SELECT s.*, g.Kuerzel AS GruppeKuerzel, g.Name AS GruppeName FROM stats s INNER JOIN ' . self::TABLE_GROUP . ' g ON s.GruppeID = g.ID ORDER BY s.Punkte DESC, AnzMitglieder LIMIT :offset, :count');
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupIdAndNameAndKuerzelAndErstellt(int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepare("SELECT ID, Name, Kuerzel, Erstellt
-            FROM " . self::TABLE_GROUP . " ORDER BY ID LIMIT :offset, :count");
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name, Kuerzel, Erstellt
+            FROM ' . self::TABLE_GROUP . ' ORDER BY ID LIMIT :offset, :count');
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getLeaderOnlineTime(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, Onlinezeit
-            FROM " . self::TABLE_USERS . "
+        $stmt = $this->prepare('SELECT ID, Name, Onlinezeit
+            FROM ' . self::TABLE_USERS . '
             WHERE ID > 0
-            ORDER BY Onlinezeit DESC, ID LIMIT 0, :limit");
+            ORDER BY Onlinezeit DESC, ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -430,9 +430,9 @@ public function getLeaderOnlineTime(int $count = 1): ?array
 
     public function getLeaderMafia(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID, m.Name, s.AusgabenMafia
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            ORDER BY s.AusgabenMafia DESC, m.ID LIMIT 0, :limit");
+        $stmt = $this->prepare('SELECT m.ID, m.Name, s.AusgabenMafia
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            ORDER BY s.AusgabenMafia DESC, m.ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -446,9 +446,9 @@ public function getLeaderMafia(int $count = 1): ?array
 
     public function getLeaderMarket(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID, m.Name, s.AusgabenMarkt
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            ORDER BY s.AusgabenMarkt DESC, m.ID LIMIT 0, :limit");
+        $stmt = $this->prepare('SELECT m.ID, m.Name, s.AusgabenMarkt
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            ORDER BY s.AusgabenMarkt DESC, m.ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -462,9 +462,9 @@ public function getLeaderMarket(int $count = 1): ?array
 
     public function getLeaderBuildings(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID, m.Name, s.AusgabenGebaeude
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            ORDER BY s.AusgabenGebaeude DESC, m.ID LIMIT 0, :limit");
+        $stmt = $this->prepare('SELECT m.ID, m.Name, s.AusgabenGebaeude
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            ORDER BY s.AusgabenGebaeude DESC, m.ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -478,9 +478,9 @@ public function getLeaderBuildings(int $count = 1): ?array
 
     public function getLeaderResearch(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID, m.Name, s.AusgabenForschung
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            ORDER BY s.AusgabenForschung DESC, m.ID LIMIT 0, :limit");
+        $stmt = $this->prepare('SELECT m.ID, m.Name, s.AusgabenForschung
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            ORDER BY s.AusgabenForschung DESC, m.ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -494,9 +494,9 @@ public function getLeaderResearch(int $count = 1): ?array
 
     public function getLeaderProduction(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID, m.Name, s.AusgabenProduktion
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            ORDER BY s.AusgabenProduktion DESC, m.ID LIMIT 0, :limit");
+        $stmt = $this->prepare('SELECT m.ID, m.Name, s.AusgabenProduktion
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            ORDER BY s.AusgabenProduktion DESC, m.ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -510,9 +510,9 @@ public function getLeaderProduction(int $count = 1): ?array
 
     public function getLeaderInterest(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID, m.Name, s.EinnahmenZinsen
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            ORDER BY s.EinnahmenZinsen DESC, m.ID LIMIT 0, :limit");
+        $stmt = $this->prepare('SELECT m.ID, m.Name, s.EinnahmenZinsen
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            ORDER BY s.EinnahmenZinsen DESC, m.ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -526,10 +526,10 @@ public function getLeaderInterest(int $count = 1): ?array
 
     public function getLeaderIgmSent(int $count = 1): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, IgmGesendet
-            FROM " . self::TABLE_USERS . "
+        $stmt = $this->prepare('SELECT ID, Name, IgmGesendet
+            FROM ' . self::TABLE_USERS . '
             WHERE ID > 0
-            ORDER BY IgmGesendet DESC, ID LIMIT 0, :limit");
+            ORDER BY IgmGesendet DESC, ID LIMIT 0, :limit');
         $stmt->bindParam('limit', $count, PDO::PARAM_INT);
         $result = $this->executeAndExtractRows($stmt);
         if (count($result) == 0) {
@@ -543,10 +543,10 @@ public function getLeaderIgmSent(int $count = 1): ?array
 
     public function getAdminBioladenLogCount(?string $werFilter, ?int $wareFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_SHOP . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_SHOP . ' WHERE ((1))',
             array(
-                "playerName LIKE :wer" => $werFilter,
-                "item = :ware" => $wareFilter,
+                'playerName LIKE :wer' => $werFilter,
+                'item = :ware' => $wareFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -555,23 +555,23 @@ public function getAdminBioladenLogCount(?string $werFilter, ?int $wareFilter):
     public function getAdminBioladenLogEntries(?string $werFilter, ?int $wareFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_SHOP . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_SHOP . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "playerName LIKE :wer" => $werFilter,
-                "item = :ware" => $wareFilter,
+                'playerName LIKE :wer' => $werFilter,
+                'item = :ware' => $wareFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminBankLogCount(?string $werFilter, ?string $wohinFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_BANK . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_BANK . ' WHERE ((1))',
             array(
-                "playerName LIKE :wer" => $werFilter,
-                "target = :wohin" => $wohinFilter,
+                'playerName LIKE :wer' => $werFilter,
+                'target = :wohin' => $wohinFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -580,24 +580,24 @@ public function getAdminBankLogCount(?string $werFilter, ?string $wohinFilter):
     public function getAdminBankLogEntries(?string $werFilter, ?string $wohinFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_BANK . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_BANK . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "playerName LIKE :wer" => $werFilter,
-                "target = :wohin" => $wohinFilter,
+                'playerName LIKE :wer' => $werFilter,
+                'target = :wohin' => $wohinFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminGroupTreasuryLogCount(?string $werFilter, ?string $wenFilter, ?int $groupFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_GROUP_CASH . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_GROUP_CASH . ' WHERE ((1))',
             array(
-                "groupId = :gruppe" => $groupFilter,
-                "senderName LIKE :wer" => $werFilter,
-                "receiverName LIKE :wen" => $wenFilter,
+                'groupId = :gruppe' => $groupFilter,
+                'senderName LIKE :wer' => $werFilter,
+                'receiverName LIKE :wen' => $wenFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -606,26 +606,26 @@ public function getAdminGroupTreasuryLogCount(?string $werFilter, ?string $wenFi
     public function getAdminGroupTreasuryLogEntries(?string $werFilter, ?string $wenFilter, ?int $groupFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_GROUP_CASH . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_GROUP_CASH . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "groupId = :gruppe" => $groupFilter,
-                "senderName LIKE :wer" => $werFilter,
-                "receiverName LIKE :wen" => $wenFilter,
+                'groupId = :gruppe' => $groupFilter,
+                'senderName LIKE :wer' => $werFilter,
+                'receiverName LIKE :wen' => $wenFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminLoginLogCount(?string $werFilter, ?string $ipFilter, ?int $artFilter, ?int $successFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_LOGIN . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_LOGIN . ' WHERE ((1))',
             array(
-                "playerName LIKE :wer" => $werFilter,
-                "IP LIKE :ip" => $ipFilter,
-                "sitter = :art" => $artFilter,
-                "success = :success" => $successFilter,
+                'playerName LIKE :wer' => $werFilter,
+                'IP LIKE :ip' => $ipFilter,
+                'sitter = :art' => $artFilter,
+                'success = :success' => $successFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -634,27 +634,27 @@ public function getAdminLoginLogCount(?string $werFilter, ?string $ipFilter, ?in
     public function getAdminLoginLogEntries(?string $werFilter, ?string $ipFilter, ?int $artFilter, ?int $successFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_LOGIN . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_LOGIN . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "playerName LIKE :wer" => $werFilter,
-                "IP LIKE :ip" => $ipFilter,
-                "sitter = :art" => $artFilter,
-                "success = :success" => $successFilter,
+                'playerName LIKE :wer' => $werFilter,
+                'IP LIKE :ip' => $ipFilter,
+                'sitter = :art' => $artFilter,
+                'success = :success' => $successFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminMafiaLogCount(?string $werFilter, ?string $wenFilter, ?string $artFilter, ?int $filter_success): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_MAFIA . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_MAFIA . ' WHERE ((1))',
             array(
-                "senderName LIKE :wer" => $werFilter,
-                "receiverName LIKE :wen" => $wenFilter,
-                "action = :art" => $artFilter,
-                "success = :success" => $filter_success,
+                'senderName LIKE :wer' => $werFilter,
+                'receiverName LIKE :wen' => $wenFilter,
+                'action = :art' => $artFilter,
+                'success = :success' => $filter_success,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -663,28 +663,28 @@ public function getAdminMafiaLogCount(?string $werFilter, ?string $wenFilter, ?s
     public function getAdminMafiaLogEntries(?string $werFilter, ?string $wenFilter, ?string $artFilter, ?int $filter_success, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_MAFIA . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_MAFIA . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "senderName LIKE :wer" => $werFilter,
-                "receiverName LIKE :wen" => $wenFilter,
-                "action = :art" => $artFilter,
-                "success = :success" => $filter_success,
+                'senderName LIKE :wer' => $werFilter,
+                'receiverName LIKE :wen' => $wenFilter,
+                'action = :art' => $artFilter,
+                'success = :success' => $filter_success,
             )
         );
 
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminVertraegeLogCount(?string $werFilter, ?string $wenFilter, ?int $wareFilter, ?int $angenommenFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_CONTRACTS . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_CONTRACTS . ' WHERE ((1))',
             array(
-                "senderName LIKE :wer" => $werFilter,
-                "receiverName LIKE :wen" => $wenFilter,
-                "item = :ware" => $wareFilter,
-                "accepted = :angenommen" => $angenommenFilter,
+                'senderName LIKE :wer' => $werFilter,
+                'receiverName LIKE :wen' => $wenFilter,
+                'item = :ware' => $wareFilter,
+                'accepted = :angenommen' => $angenommenFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -693,26 +693,26 @@ public function getAdminVertraegeLogCount(?string $werFilter, ?string $wenFilter
     public function getAdminVertraegeLogEntries(?string $werFilter, ?string $wenFilter, ?int $wareFilter, ?int $angenommenFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_CONTRACTS . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_CONTRACTS . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "senderName LIKE :wer" => $werFilter,
-                "receiverName LIKE :wen" => $wenFilter,
-                "item = :ware" => $wareFilter,
-                "accepted = :angenommen" => $angenommenFilter,
+                'senderName LIKE :wer' => $werFilter,
+                'receiverName LIKE :wen' => $wenFilter,
+                'item = :ware' => $wareFilter,
+                'accepted = :angenommen' => $angenommenFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminMarketLogCount(?string $verkaeuferFilter, ?string $kaeuferFilter, ?int $wareFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_MARKET . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_MARKET . ' WHERE ((1))',
             array(
-                "sellerName LIKE :wer" => $verkaeuferFilter,
-                "buyerName LIKE :wen" => $kaeuferFilter,
-                "item = :ware" => $wareFilter,
+                'sellerName LIKE :wer' => $verkaeuferFilter,
+                'buyerName LIKE :wen' => $kaeuferFilter,
+                'item = :ware' => $wareFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -721,24 +721,24 @@ public function getAdminMarketLogCount(?string $verkaeuferFilter, ?string $kaeuf
     public function getAdminMarketLogEntries(?string $verkaeuferFilter, ?string $kaeuferFilter, ?int $wareFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_MARKET . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_MARKET . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "sellerName LIKE :wer" => $verkaeuferFilter,
-                "buyerName LIKE :wen" => $kaeuferFilter,
-                "item = :ware" => $wareFilter,
+                'sellerName LIKE :wer' => $verkaeuferFilter,
+                'buyerName LIKE :wen' => $kaeuferFilter,
+                'item = :ware' => $wareFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAdminMessageLogCount(?string $senderFilter, ?string $receiverFilter): ?int
     {
-        $stmt = $this->prepareAndBind("SELECT count(1) AS count FROM " . self::TABLE_LOG_MESSAGES . " WHERE ((1))",
+        $stmt = $this->prepareAndBind('SELECT count(1) AS count FROM ' . self::TABLE_LOG_MESSAGES . ' WHERE ((1))',
             array(
-                "senderName LIKE :wer" => $senderFilter,
-                "receiverName LIKE :wen" => $receiverFilter,
+                'senderName LIKE :wer' => $senderFilter,
+                'receiverName LIKE :wen' => $receiverFilter,
             )
         );
         return $this->executeAndExtractField($stmt, 'count');
@@ -747,64 +747,64 @@ public function getAdminMessageLogCount(?string $senderFilter, ?string $receiver
     public function getAdminMessageLogEntries(?string $senderFilter, ?string $receiverFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepareAndBind("SELECT * FROM " . self::TABLE_LOG_MESSAGES . " WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count",
+        $stmt = $this->prepareAndBind('SELECT * FROM ' . self::TABLE_LOG_MESSAGES . ' WHERE ((1)) ORDER BY created DESC LIMIT :offset, :count',
             array(
-                "senderName LIKE :wer" => $senderFilter,
-                "receiverName LIKE :wen" => $receiverFilter,
+                'senderName LIKE :wer' => $senderFilter,
+                'receiverName LIKE :wen' => $receiverFilter,
             )
         );
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getMarktplatzEntryById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Von, Menge, Was, Preis FROM " . self::TABLE_MARKET . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Von, Menge, Was, Preis FROM ' . self::TABLE_MARKET . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getMarktplatzEntryByIdAndVon(int $id, int $von): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Von, Menge, Was, Preis FROM " . self::TABLE_MARKET . " WHERE ID = :id AND Von = :von");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
-        $stmt->bindParam("von", $von, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Von, Menge, Was, Preis FROM ' . self::TABLE_MARKET . ' WHERE ID = :id AND Von = :von');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
+        $stmt->bindParam('von', $von, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getVertragEntryById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT v.ID, Von AS VonId, m1.Name AS Von, An AS AnId, m2.Name AS AnName, Menge, Was, Preis
-            FROM (" . self::TABLE_CONTRACTS . " v JOIN " . self::TABLE_USERS . " m1 ON m1.ID = v.Von) JOIN " . self::TABLE_USERS . " m2 ON m2.ID = v.An
-            WHERE v.ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT v.ID, Von AS VonId, m1.Name AS Von, An AS AnId, m2.Name AS AnName, Menge, Was, Preis
+            FROM (' . self::TABLE_CONTRACTS . ' v JOIN ' . self::TABLE_USERS . ' m1 ON m1.ID = v.Von) JOIN ' . self::TABLE_USERS . ' m2 ON m2.ID = v.An
+            WHERE v.ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerEmailAndBeschreibungAndSitterSettingsById(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT m.EMail, m.Beschreibung, s.*
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_SITTER . " s ON m.ID = s.user_id
-            WHERE m.ID = :id");
-        $stmt->bindParam("id", $blm_user);
+        $stmt = $this->prepare('SELECT m.EMail, m.Beschreibung, s.*
+            FROM ' . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_SITTER . ' s ON m.ID = s.user_id
+            WHERE m.ID = :id');
+        $stmt->bindParam('id', $blm_user);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getNotizblock(int $id): ?string
     {
-        $stmt = $this->prepare("SELECT Notizblock FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Notizblock FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'Notizblock');
     }
 
     public function getMarktplatzCount(array $warenFilter = array()): ?int
     {
         if (sizeof($warenFilter) == 0) {
-            $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_MARKET);
+            $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_MARKET);
         } else {
-            $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_MARKET . "
-                         WHERE Was IN (" . str_repeat('?, ', count($warenFilter) - 1) . "?)");
+            $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_MARKET . '
+                         WHERE Was IN (' . str_repeat('?, ', count($warenFilter) - 1) . '?)');
         }
         return $this->executeAndExtractField($stmt, 'count', $warenFilter);
     }
@@ -813,29 +813,29 @@ public function getMarktplatzEntries(array $warenFilter, int $page, int $entries
     {
         $offset = $page * $entriesPerPage;
         if (sizeof($warenFilter) == 0) {
-            $stmt = $this->prepare("SELECT m1.ID, m1.Von AS VonId, m2.Name AS VonName, m1.Was, m1.Menge, m1.Preis, m1.Menge * m1.Preis AS Gesamtpreis 
-                FROM " . self::TABLE_MARKET . " m1 JOIN " . self::TABLE_USERS . " m2 ON m2.ID = m1.Von ORDER BY ID DESC LIMIT :offset, :count");
+            $stmt = $this->prepare('SELECT m1.ID, m1.Von AS VonId, m2.Name AS VonName, m1.Was, m1.Menge, m1.Preis, m1.Menge * m1.Preis AS Gesamtpreis 
+                FROM ' . self::TABLE_MARKET . ' m1 JOIN ' . self::TABLE_USERS . ' m2 ON m2.ID = m1.Von ORDER BY ID DESC LIMIT :offset, :count');
         } else {
             $fields = array();
             for ($i = 0; $i < count($warenFilter); $i++) {
                 $fields[] = sprintf(':ware_%d', $i);
             }
-            $stmt = $this->prepare("SELECT m1.ID, m1.Von AS VonId, m2.Name AS VonName, m1.Was, m1.Menge, m1.Preis, m1.Menge * m1.Preis AS Gesamtpreis 
-                FROM " . self::TABLE_MARKET . " m1 JOIN " . self::TABLE_USERS . " m2 ON m2.ID = m1.Von
-                WHERE m1.Was IN (" . implode(', ', $fields) . ") ORDER BY ID DESC LIMIT :offset, :count");
+            $stmt = $this->prepare('SELECT m1.ID, m1.Von AS VonId, m2.Name AS VonName, m1.Was, m1.Menge, m1.Preis, m1.Menge * m1.Preis AS Gesamtpreis 
+                FROM ' . self::TABLE_MARKET . ' m1 JOIN ' . self::TABLE_USERS . ' m2 ON m2.ID = m1.Von
+                WHERE m1.Was IN (' . implode(', ', $fields) . ') ORDER BY ID DESC LIMIT :offset, :count');
             for ($i = 0; $i < count($warenFilter); $i++) {
                 $stmt->bindParam($fields[$i], $warenFilter[$i], PDO::PARAM_INT);
             }
 
         }
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupMessageCount(int $groupId): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_GROUP_MESSAGES . " WHERE Gruppe = :id");
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_GROUP_MESSAGES . ' WHERE Gruppe = :id');
         $stmt->bindParam('id', $groupId, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'count');
     }
@@ -844,17 +844,17 @@ public function getGroupMessageEntries(int $groupId, int $page, int $entriesPerP
     {
         $offset = $page * $entriesPerPage;
         $stmt = $this->prepare("SELECT n.*, m.ID AS VonID, coalesce(m.Name, 'Gelöscht') AS VonName
-            FROM " . self::TABLE_GROUP_MESSAGES . " n LEFT OUTER JOIN " . self::TABLE_USERS . " m ON n.Von = m.ID
-            WHERE n.Gruppe = :id ORDER BY n.Festgepinnt DESC, n.Zeit DESC LIMIT :offset, :count");
+            FROM " . self::TABLE_GROUP_MESSAGES . ' n LEFT OUTER JOIN ' . self::TABLE_USERS . ' m ON n.Von = m.ID
+            WHERE n.Gruppe = :id ORDER BY n.Festgepinnt DESC, n.Zeit DESC LIMIT :offset, :count');
         $stmt->bindParam('id', $groupId, PDO::PARAM_INT);
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupLogCount(int $groupId): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_GROUP_LOG . " WHERE Gruppe = :id");
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_GROUP_LOG . ' WHERE Gruppe = :id');
         $stmt->bindParam('id', $groupId, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'count');
     }
@@ -862,401 +862,401 @@ public function getGroupLogCount(int $groupId): ?int
     public function getGroupLogEntries(int $groupId, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_GROUP_LOG . " WHERE Gruppe = :id ORDER BY Datum DESC LIMIT :offset, :count");
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_GROUP_LOG . ' WHERE Gruppe = :id ORDER BY Datum DESC LIMIT :offset, :count');
         $stmt->bindParam('id', $groupId, PDO::PARAM_INT);
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getVertragCount(string $werFilter, string $wenFilter): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_CONTRACTS . " WHERE Von LIKE :wer AND AN LIKE :wen");
-        $stmt->bindParam("wer", $werFilter);
-        $stmt->bindParam("wen", $wenFilter);
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_CONTRACTS . ' WHERE Von LIKE :wer AND AN LIKE :wen');
+        $stmt->bindParam('wer', $werFilter);
+        $stmt->bindParam('wen', $wenFilter);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getVertragEntries(string $werFilter, string $wenFilter, int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepare("SELECT v.ID, Von AS VonId, m1.Name as VonName, An AS AnId, m2.Name AS AnName, Was, Menge, Preis, Menge * Preis AS Gesamtpreis 
-            FROM (" . self::TABLE_CONTRACTS . " v JOIN " . self::TABLE_USERS . " m1 ON m1.ID = v.Von) JOIN " . self::TABLE_USERS . " m2 ON m2.Id = v.An
-            WHERE Von LIKE :wer AND AN LIKE :wen LIMIT :offset, :count");
-        $stmt->bindParam("wer", $werFilter);
-        $stmt->bindParam("wen", $wenFilter);
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT v.ID, Von AS VonId, m1.Name as VonName, An AS AnId, m2.Name AS AnName, Was, Menge, Preis, Menge * Preis AS Gesamtpreis 
+            FROM (' . self::TABLE_CONTRACTS . ' v JOIN ' . self::TABLE_USERS . ' m1 ON m1.ID = v.Von) JOIN ' . self::TABLE_USERS . ' m2 ON m2.Id = v.An
+            WHERE Von LIKE :wer AND AN LIKE :wen LIMIT :offset, :count');
+        $stmt->bindParam('wer', $werFilter);
+        $stmt->bindParam('wen', $wenFilter);
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupCount(): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_GROUP);
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_GROUP);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getEwigePunkteCount(): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_USERS . " WHERE EwigePunkte > 0");
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_USERS . ' WHERE EwigePunkte > 0');
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getAllGroupIdsAndName(): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name FROM " . self::TABLE_GROUP);
+        $stmt = $this->prepare('SELECT ID, Name FROM ' . self::TABLE_GROUP);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllPlayerIdsAndName(): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name FROM " . self::TABLE_USERS . " WHERE ID > 0 ORDER BY Name");
+        $stmt = $this->prepare('SELECT ID, Name FROM ' . self::TABLE_USERS . ' WHERE ID > 0 ORDER BY Name');
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllPlayerIdsAndNameAndEMailAndRegistriertAmAndGesperrtAndVerwarnungen(int $page, int $entriesPerPage): ?array
     {
         $offset = $page * $entriesPerPage;
-        $stmt = $this->prepare("SELECT ID, Name, EMail, RegistriertAm, Gesperrt, Verwarnungen FROM " . self::TABLE_USERS . " WHERE ID > 0 ORDER BY ID LIMIT :offset, :count");
-        $stmt->bindParam("offset", $offset, PDO::PARAM_INT);
-        $stmt->bindParam("count", $entriesPerPage, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name, EMail, RegistriertAm, Gesperrt, Verwarnungen FROM ' . self::TABLE_USERS . ' WHERE ID > 0 ORDER BY ID LIMIT :offset, :count');
+        $stmt->bindParam('offset', $offset, PDO::PARAM_INT);
+        $stmt->bindParam('count', $entriesPerPage, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllPlayerIdsAndNameAndEmailAndEmailActAndLastLogin(): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, EMail, EMailAct, LastLogin FROM " . self::TABLE_USERS . " WHERE ID > 0 ORDER BY Name");
+        $stmt = $this->prepare('SELECT ID, Name, EMail, EMailAct, LastLogin FROM ' . self::TABLE_USERS . ' WHERE ID > 0 ORDER BY Name');
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupIdAndPasswordByNameOrTag(string $name): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Passwort FROM " . self::TABLE_GROUP . " WHERE Name = :name OR Kuerzel = :name");
-        $stmt->bindParam("name", $name);
+        $stmt = $this->prepare('SELECT ID, Passwort FROM ' . self::TABLE_GROUP . ' WHERE Name = :name OR Kuerzel = :name');
+        $stmt->bindParam('name', $name);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getGroupIdAndNameByNameOrTag(string $name): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name FROM " . self::TABLE_GROUP . " WHERE Name = :name OR Kuerzel = :name");
-        $stmt->bindParam("name", $name);
+        $stmt = $this->prepare('SELECT ID, Name FROM ' . self::TABLE_GROUP . ' WHERE Name = :name OR Kuerzel = :name');
+        $stmt->bindParam('name', $name);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getGroupIdAndNameById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name FROM " . self::TABLE_GROUP . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name FROM ' . self::TABLE_GROUP . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerDataByName(string $name): ?array
     {
-        $stmt = $this->prepare("SELECT m.ID AS ID, Name, Admin, EMailAct, Gesperrt, m.Passwort AS user_password, s.Passwort AS sitter_password
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_SITTER . " s ON m.ID = s.user_id
+        $stmt = $this->prepare('SELECT m.ID AS ID, Name, Admin, EMailAct, Gesperrt, m.Passwort AS user_password, s.Passwort AS sitter_password
+            FROM ' . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_SITTER . ' s ON m.ID = s.user_id
             WHERE m.Name = :name
-            AND m.ID > 0");
-        $stmt->bindParam("name", $name);
+            AND m.ID > 0');
+        $stmt->bindParam('name', $name);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerDataById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_USERS . " WHERE ID = :id AND ID > 0");
-        $stmt->bindParam("id", $id);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_USERS . ' WHERE ID = :id AND ID > 0');
+        $stmt->bindParam('id', $id);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerNameAndBankAndMoneyAndGroupById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT Name, Bank, Geld, Gruppe, Gebaeude9 FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Name, Bank, Geld, Gruppe, Gebaeude9 FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerNameAndGroupIdAndGroupRightsById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT m.Name, m.Gruppe, r.*
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_GROUP_RIGHTS . " r ON m.Gruppe = r.group_id AND m.ID = r.user_id
-            WHERE m.ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT m.Name, m.Gruppe, r.*
+            FROM ' . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_GROUP_RIGHTS . ' r ON m.Gruppe = r.group_id AND m.ID = r.user_id
+            WHERE m.ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerStock(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT " . getAllStockFields() . " FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ' . getAllStockFields() . ' FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerPlantageAndBauhofLevel(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT Gebaeude1, Gebaeude5 FROM " . self::TABLE_USERS . " WHERE ID = :id AND ID > 0");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Gebaeude1, Gebaeude5 FROM ' . self::TABLE_USERS . ' WHERE ID = :id AND ID > 0');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerPointsAndMoneyAndNextMafiaAndGroupById(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT Punkte, Geld, NextMafia, Gruppe from " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Punkte, Geld, NextMafia, Gruppe from ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerNameAndPointsAndGruppeAndPlantageLevelById(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT m.Name, m.Punkte, m.Gebaeude1, gr.ID AS GruppeID, gr.Name AS GruppeName
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_GROUP . " gr ON m.Gruppe = gr.ID
-            WHERE m.ID = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT m.Name, m.Punkte, m.Gebaeude1, gr.ID AS GruppeID, gr.Name AS GruppeName
+            FROM ' . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_GROUP . ' gr ON m.Gruppe = gr.ID
+            WHERE m.ID = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getGroupInformationById(int $group): ?array
     {
-        $stmt = $this->prepare("SELECT g.ID, g.Name, g.Kuerzel, g.Erstellt, g.Beschreibung, (SELECT SUM(Punkte) FROM " . self::TABLE_USERS . " m WHERE m.Gruppe = g.ID) AS Punkte, g.LastImageChange, g.Kasse
-            FROM " . self::TABLE_GROUP . " g INNER JOIN " . self::TABLE_USERS . " m ON g.ID = m.Gruppe
-            WHERE g.ID = :id");
-        $stmt->bindParam("id", $group, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT g.ID, g.Name, g.Kuerzel, g.Erstellt, g.Beschreibung, (SELECT SUM(Punkte) FROM ' . self::TABLE_USERS . ' m WHERE m.Gruppe = g.ID) AS Punkte, g.LastImageChange, g.Kasse
+            FROM ' . self::TABLE_GROUP . ' g INNER JOIN ' . self::TABLE_USERS . ' m ON g.ID = m.Gruppe
+            WHERE g.ID = :id');
+        $stmt->bindParam('id', $group, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getGroupRightsByUserId(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_GROUP_RIGHTS . " WHERE user_id = :uid");
-        $stmt->bindParam("uid", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_GROUP_RIGHTS . ' WHERE user_id = :uid');
+        $stmt->bindParam('uid', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getAllGroupRightsByGroupId(int $group_id): ?array
     {
         $stmt = $this->prepare("SELECT r.*, m.ID AS UserId, coalesce(m.Name, 'Gelöscht') AS UserName
-            FROM " . self::TABLE_GROUP_RIGHTS . " r LEFT OUTER JOIN " . self::TABLE_USERS . " m ON r.user_id = m.ID
-            WHERE r.group_id = :gid");
-        $stmt->bindParam("gid", $group_id, PDO::PARAM_INT);
+            FROM " . self::TABLE_GROUP_RIGHTS . ' r LEFT OUTER JOIN ' . self::TABLE_USERS . ' m ON r.user_id = m.ID
+            WHERE r.group_id = :gid');
+        $stmt->bindParam('gid', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupCashById(int $group_id): ?float
     {
-        $stmt = $this->prepare("SELECT Kasse FROM " . self::TABLE_GROUP . " WHERE ID = :gid");
-        $stmt->bindParam("gid", $group_id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Kasse FROM ' . self::TABLE_GROUP . ' WHERE ID = :gid');
+        $stmt->bindParam('gid', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'Kasse');
     }
 
     public function getGroupCashSumByUserId(int $blm_user): ?float
     {
-        $stmt = $this->prepare("SELECT coalesce(SUM(amount), 0) AS summe FROM " . self::TABLE_GROUP_CASH . " WHERE user_id = :uid");
-        $stmt->bindParam("uid", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT coalesce(SUM(amount), 0) AS summe FROM ' . self::TABLE_GROUP_CASH . ' WHERE user_id = :uid');
+        $stmt->bindParam('uid', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'summe');
     }
 
     public function getAllGroupCashById(int $group_id): ?array
     {
         $stmt = $this->prepare("SELECT k.*, m.ID AS UserID, coalesce(m.Name, 'Gelöscht') AS UserName, if(m.Gruppe = g.ID, 1, 0) AS IstMitglied
-            FROM (" . self::TABLE_GROUP_CASH . " k LEFT OUTER JOIN " . self::TABLE_USERS . " m ON k.user_id = m.ID) LEFT OUTER JOIN " . self::TABLE_GROUP . " g On k.group_id = g.ID
-            WHERE k.group_id = :gid ORDER BY k.amount DESC");
-        $stmt->bindParam("gid", $group_id, PDO::PARAM_INT);
+            FROM (" . self::TABLE_GROUP_CASH . ' k LEFT OUTER JOIN ' . self::TABLE_USERS . ' m ON k.user_id = m.ID) LEFT OUTER JOIN ' . self::TABLE_GROUP . ' g On k.group_id = g.ID
+            WHERE k.group_id = :gid ORDER BY k.amount DESC');
+        $stmt->bindParam('gid', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupMembersById(int $group_id): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, Punkte, LastAction FROM " . self::TABLE_USERS . " WHERE Gruppe = :id ORDER BY Punkte DESC");
-        $stmt->bindParam("id", $group_id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name, Punkte, LastAction FROM ' . self::TABLE_USERS . ' WHERE Gruppe = :id ORDER BY Punkte DESC');
+        $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getGroupMemberCountById(int $group_id): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_USERS . " WHERE Gruppe = :id ORDER BY Punkte DESC");
-        $stmt->bindParam("id", $group_id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_USERS . ' WHERE Gruppe = :id ORDER BY Punkte DESC');
+        $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getAllGroupDiplomacyById(int $group_id): ?array
     {
-        $stmt = $this->prepare("SELECT gd.ID, gd.Von, gd.An, gr.ID AS GruppeID, gr.Name AS GruppeName, gd.Typ, gd.Aktiv, gd.Seit, gd.Betrag
-            FROM " . self::TABLE_GROUP_DIPLOMACY . " gd INNER JOIN " . self::TABLE_GROUP . " gr ON gd.An = gr.ID
+        $stmt = $this->prepare('SELECT gd.ID, gd.Von, gd.An, gr.ID AS GruppeID, gr.Name AS GruppeName, gd.Typ, gd.Aktiv, gd.Seit, gd.Betrag
+            FROM ' . self::TABLE_GROUP_DIPLOMACY . ' gd INNER JOIN ' . self::TABLE_GROUP . ' gr ON gd.An = gr.ID
             WHERE gd.Von = :id
             UNION
             SELECT gd.ID, gd.Von, gd.An, gr.ID AS GruppeID, gr.Name AS GruppeName, gd.Typ, gd.Aktiv, gd.Seit, gd.Betrag
-            FROM " . self::TABLE_GROUP_DIPLOMACY . " gd INNER JOIN " . self::TABLE_GROUP . " gr ON gd.Von = gr.ID
-            WHERE gd.An = :id");
-        $stmt->bindParam("id", $group_id, PDO::PARAM_INT);
+            FROM ' . self::TABLE_GROUP_DIPLOMACY . ' gd INNER JOIN ' . self::TABLE_GROUP . ' gr ON gd.Von = gr.ID
+            WHERE gd.An = :id');
+        $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllPendingGroupDiplomacyById(int $group_id): ?array
     {
-        $stmt = $this->prepare("SELECT gd.ID, gd.Von, gr.ID AS VonId, gr.Name AS VonName, gd.Typ, gd.Seit
-            FROM " . self::TABLE_GROUP_DIPLOMACY . " gd INNER JOIN " . self::TABLE_GROUP . " gr ON gd.Von = gr.ID
-            WHERE gd.An = :id AND gd.Aktiv = 0");
-        $stmt->bindParam("id", $group_id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT gd.ID, gd.Von, gr.ID AS VonId, gr.Name AS VonName, gd.Typ, gd.Seit
+            FROM ' . self::TABLE_GROUP_DIPLOMACY . ' gd INNER JOIN ' . self::TABLE_GROUP . ' gr ON gd.Von = gr.ID
+            WHERE gd.An = :id AND gd.Aktiv = 0');
+        $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getPlayerPointsAndGruppeAndMoneyAndNextMafiaAndPizzeriaById(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, Punkte, Gruppe, Geld, NextMafia, Gebaeude8
-            FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ID, Name, Punkte, Gruppe, Geld, NextMafia, Gebaeude8
+            FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerMoneyAndBuildingLevelsAndPointsAndEinnahmenZinsen(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT m.Geld, m.Punkte, " . getAllBuildingFields() . ", s.EinnahmenZinsen
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id
-            WHERE m.ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT m.Geld, m.Punkte, ' . getAllBuildingFields() . ', s.EinnahmenZinsen
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id
+            WHERE m.ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerMoneyAndResearchLevelsAndPlantageLevel(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT Geld, Gebaeude1, " . getAllResearchFields() . " FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Geld, Gebaeude1, ' . getAllResearchFields() . ' FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerResearchLevelsAndAllStorageAndShopLevelAndSchoolLevel(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT " . getAllResearchFields() . ", " . getAllStockFields() . ", Gebaeude3,  Gebaeude6
-            FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT ' . getAllResearchFields() . ', ' . getAllStockFields() . ', Gebaeude3,  Gebaeude6
+            FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getInformationForBuero(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT *
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON s.user_id = m.ID
-            WHERE m.ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT *
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON s.user_id = m.ID
+            WHERE m.ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerNextMafiaAndMoneyAndBank(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT NextMafia, Geld, Bank from " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT NextMafia, Geld, Bank from ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function existsPlayerByNameOrEmail(string $name, string $email): ?bool
     {
-        $stmt = $this->prepare("SELECT count(1) AS count FROM " . self::TABLE_USERS . " WHERE Name = :name OR EMail = :email");
-        $stmt->bindParam("name", $name);
-        $stmt->bindParam("email", $email);
+        $stmt = $this->prepare('SELECT count(1) AS count FROM ' . self::TABLE_USERS . ' WHERE Name = :name OR EMail = :email');
+        $stmt->bindParam('name', $name);
+        $stmt->bindParam('email', $email);
         return $this->executeAndExtractField($stmt, 'count') > 0;
     }
 
     public function getPlayerIDByName(string $name): ?int
     {
-        $stmt = $this->prepare("SELECT ID FROM " . self::TABLE_USERS . " WHERE Name = :name AND ID > 0");
-        $stmt->bindParam("name", $name);
+        $stmt = $this->prepare('SELECT ID FROM ' . self::TABLE_USERS . ' WHERE Name = :name AND ID > 0');
+        $stmt->bindParam('name', $name);
         return $this->executeAndExtractField($stmt, 'ID');
     }
 
     public function getAllAuftraegeByVonAndWasGreaterEqualsAndWasSmaller(int $blm_user, int $minWas = 0, int $maxWas = 999): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_JOBS . " WHERE user_id = :id AND item >= :min AND item < :max ORDER BY finished");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
-        $stmt->bindParam("min", $minWas, PDO::PARAM_INT);
-        $stmt->bindParam("max", $maxWas, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_JOBS . ' WHERE user_id = :id AND item >= :min AND item < :max ORDER BY finished');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
+        $stmt->bindParam('min', $minWas, PDO::PARAM_INT);
+        $stmt->bindParam('max', $maxWas, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllExpiredAuftraegeByVon(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_JOBS . " WHERE user_id = :id AND finished <= CURRENT_TIMESTAMP()");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_JOBS . ' WHERE user_id = :id AND finished <= CURRENT_TIMESTAMP()');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getPlayerMoneyAndResearchLevelsAndPlantageLevelAndResearchLabLevel(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT Geld, " . getAllResearchFields() . ", Gebaeude1, Gebaeude2
-            FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Geld, ' . getAllResearchFields() . ', Gebaeude1, Gebaeude2
+            FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerBankAndMoneyGroupIdAndBioladenLevelAndDoenerstandLevel(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT Bank, Geld, Gruppe, Gebaeude3, Gebaeude4
-            FROM " . self::TABLE_USERS . " WHERE ID = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT Bank, Geld, Gruppe, Gebaeude3, Gebaeude4
+            FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getUnreadMessageCount(int $blm_user): ?int
     {
-        $stmt = $this->prepare("SELECT COUNT(1) AS count FROM " . self::TABLE_MESSAGES . " WHERE An = :id AND Gelesen = 0");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT COUNT(1) AS count FROM ' . self::TABLE_MESSAGES . ' WHERE An = :id AND Gelesen = 0');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getOpenContractCount(int $blm_user): ?int
     {
-        $stmt = $this->prepare("SELECT COUNT(1) AS count FROM " . self::TABLE_CONTRACTS . " WHERE An = :id");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT COUNT(1) AS count FROM ' . self::TABLE_CONTRACTS . ' WHERE An = :id');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getOnlinePlayerCount(): ?int
     {
-        $stmt = $this->prepare("SELECT COUNT(1) AS count
-            FROM " . self::TABLE_USERS . "
-            WHERE LastAction >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 30 MINUTE)");
+        $stmt = $this->prepare('SELECT COUNT(1) AS count
+            FROM ' . self::TABLE_USERS . '
+            WHERE LastAction >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 30 MINUTE)');
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getUnreadGroupMessageCount(int $group_id, int $blm_user): ?int
     {
-        $stmt = $this->prepare("SELECT COUNT(1) AS count
-            FROM " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_GROUP_MESSAGES . " n ON m.Gruppe = n.Gruppe
-            WHERE m.ID = :userId AND m.Gruppe = :groupId AND n.Zeit > m.GruppeLastMessageZeit");
-        $stmt->bindParam("groupId", $group_id, PDO::PARAM_INT);
-        $stmt->bindParam("userId", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT COUNT(1) AS count
+            FROM ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_GROUP_MESSAGES . ' n ON m.Gruppe = n.Gruppe
+            WHERE m.ID = :userId AND m.Gruppe = :groupId AND n.Zeit > m.GruppeLastMessageZeit');
+        $stmt->bindParam('groupId', $group_id, PDO::PARAM_INT);
+        $stmt->bindParam('userId', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'count');
     }
 
     public function getServerStatistics(): ?array
     {
         // @formatter:off
-        $stmt = $this->prepare("with
+        $stmt = $this->prepare('with
 glob_stats as (
     SELECT
         SUM(AusgabenGebaeude + AusgabenForschung + AusgabenZinsen + AusgabenProduktion + AusgabenMarkt + AusgabenVertraege + AusgabenMafia) AS AusgabenGesamt,
         SUM(EinnahmenGebaeude + EinnahmenVerkauf + EinnahmenZinsen + EinnahmenMarkt + EinnahmenVertraege + EinnahmenMafia) AS EinnahmenGesamt,
         SUM(AusgabenForschung) AS AusgabenForschung,
         SUM(AusgabenGebaeude) AS AusgabenGebaeude
-    FROM " . self::TABLE_STATISTICS . "
+    FROM ' . self::TABLE_STATISTICS . '
 ), glob_mitglieder as (
     SELECT
-        SUM(" . getAllResearchFields('+') . ") AS GesamtForschung,
-        SUM(" . getAllBuildingFields('+') . ") AS GesamtGebaeude,
+        SUM(' . getAllResearchFields('+') . ') AS GesamtForschung,
+        SUM(' . getAllBuildingFields('+') . ') AS GesamtGebaeude,
         COUNT(1) AS AnzahlSpieler,
         SUM(IGMGesendet) AS AnzahlIGMs
-    FROM " . self::TABLE_USERS . "
+    FROM ' . self::TABLE_USERS . '
     WHERE ID > 0
 )
 SELECT
     s.*,
     m.*,
-    (SELECT COUNT(1) FROM " . self::TABLE_GROUP . ")  AS AnzahlGruppen,
-    (SELECT COUNT(1) FROM " . self::TABLE_USERS . " WHERE Gruppe IS NOT NULL) AS AnzahlSpielerInGruppe
+    (SELECT COUNT(1) FROM ' . self::TABLE_GROUP . ')  AS AnzahlGruppen,
+    (SELECT COUNT(1) FROM ' . self::TABLE_USERS . ' WHERE Gruppe IS NOT NULL) AS AnzahlSpielerInGruppe
 FROM
-    glob_stats s, glob_mitglieder m");
+    glob_stats s, glob_mitglieder m');
         // @formatter:on
         $result = $this->executeAndExtractFirstRow($stmt);
         if ($result !== null) {
-            $stmt = $this->prepare("SHOW TABLE STATUS FROM `" . Config::get(Config::SECTION_DATABASE, 'database') . "` WHERE `name` = :table");
+            $stmt = $this->prepare('SHOW TABLE STATUS FROM `' . Config::get(Config::SECTION_DATABASE, 'database') . '` WHERE `name` = :table');
             $table = self::TABLE_JOBS;
-            $stmt->bindParam("table", $table);
+            $stmt->bindParam('table', $table);
             $result['AnzahlAuftraege'] = $this->executeAndExtractField($stmt, 'Auto_increment');
         }
         return $result;
@@ -1264,58 +1264,58 @@ public function getServerStatistics(): ?array
 
     public function getAllContractsByAnEquals(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT v.*, m.ID AS VonID, m.Name AS VonName
-            FROM " . self::TABLE_CONTRACTS . " v INNER JOIN " . self::TABLE_USERS . " m ON v.Von = m.ID
-            WHERE An = :id ORDER BY Wann");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT v.*, m.ID AS VonID, m.Name AS VonName
+            FROM ' . self::TABLE_CONTRACTS . ' v INNER JOIN ' . self::TABLE_USERS . ' m ON v.Von = m.ID
+            WHERE An = :id ORDER BY Wann');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getAllContractsByVonEquals(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT v.*, m.ID AS AnID, m.Name AS AnName
-            FROM " . self::TABLE_CONTRACTS . " v INNER JOIN " . self::TABLE_USERS . " m ON v.An = m.ID
-            WHERE Von = :id ORDER BY Wann");
-        $stmt->bindParam("id", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT v.*, m.ID AS AnID, m.Name AS AnName
+            FROM ' . self::TABLE_CONTRACTS . ' v INNER JOIN ' . self::TABLE_USERS . ' m ON v.An = m.ID
+            WHERE Von = :id ORDER BY Wann');
+        $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractRows($stmt);
     }
 
     public function getContractByIdAndAn(int $id, int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT v.*, m.Name AS AnName
-            FROM " . self::TABLE_CONTRACTS . " v LEFT OUTER JOIN " . self::TABLE_USERS . " m ON v.An = m.ID
-            WHERE v.ID = :id AND v.An = :user");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
-        $stmt->bindParam("user", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT v.*, m.Name AS AnName
+            FROM ' . self::TABLE_CONTRACTS . ' v LEFT OUTER JOIN ' . self::TABLE_USERS . ' m ON v.An = m.ID
+            WHERE v.ID = :id AND v.An = :user');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
+        $stmt->bindParam('user', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getContractByIDAndAnOrVonEquals(int $id, int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_CONTRACTS . " WHERE ID = :id AND (An = :user OR Von = :user)");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
-        $stmt->bindParam("user", $blm_user, PDO::PARAM_INT);
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_CONTRACTS . ' WHERE ID = :id AND (An = :user OR Von = :user)');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
+        $stmt->bindParam('user', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getMessageByIdAndAnOrVonEquals(int $id, int $blm_user): ?array
     {
         $stmt = $this->prepare("SELECT n.*, mVon.ID AS VonID, coalesce(mVon.Name, 'Gelöscht') AS VonName, mAn.ID AS AnID, coalesce(mAn.Name, 'Gelöscht') AS AnName
-            FROM (" . self::TABLE_MESSAGES . " n LEFT OUTER JOIN " . self::TABLE_USERS . " mVon ON n.Von = mVon.ID) LEFT OUTER JOIN " . self::TABLE_USERS . " mAn ON n.An = mAn.ID
-            WHERE n.ID = :id AND (n.An = :user OR n.Von = :user)");
-        $stmt->bindParam("id", $id, PDO::PARAM_INT);
-        $stmt->bindParam("user", $blm_user, PDO::PARAM_INT);
+            FROM (" . self::TABLE_MESSAGES . ' n LEFT OUTER JOIN ' . self::TABLE_USERS . ' mVon ON n.Von = mVon.ID) LEFT OUTER JOIN ' . self::TABLE_USERS . ' mAn ON n.An = mAn.ID
+            WHERE n.ID = :id AND (n.An = :user OR n.Von = :user)');
+        $stmt->bindParam('id', $id, PDO::PARAM_INT);
+        $stmt->bindParam('user', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getAllPlayerIdAndBankAndBioladenAndDoenerstandAndBank(): ?array
     {
-        return $this->executeAndExtractRows($this->prepare("SELECT ID, Bank, Gebaeude" . building_shop . ", Gebaeude" . building_kebab_stand . ", Gebaeude" . building_bank . " FROM " . self::TABLE_USERS . " WHERE ID > 0 AND EmailAct IS NULL"));
+        return $this->executeAndExtractRows($this->prepare('SELECT ID, Bank, Gebaeude' . building_shop . ', Gebaeude' . building_kebab_stand . ', Gebaeude' . building_bank . ' FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND EmailAct IS NULL'));
     }
 
     public function getAllPlayerIdAndResearchLevels(): ?array
     {
-        return $this->executeAndExtractRows($this->prepare("SELECT ID, " . getAllResearchFields() . " FROM " . self::TABLE_USERS . " WHERE ID > 0 AND EmailAct IS NULL"));
+        return $this->executeAndExtractRows($this->prepare('SELECT ID, ' . getAllResearchFields() . ' FROM ' . self::TABLE_USERS . ' WHERE ID > 0 AND EmailAct IS NULL'));
     }
 
     public function getPlayerCardByID(int $blm_user): ?array
@@ -1323,24 +1323,24 @@ public function getPlayerCardByID(int $blm_user): ?array
         $stmt = $this->prepare("SELECT m.ID, m.Name, coalesce(m.Beschreibung, '[i]Keine[/i]') AS Beschreibung, 
                 m.RegistriertAm, m.Punkte, m.Verwarnungen, m.Gesperrt, m.LastLogin, m.IgmGesendet, m.IgmEmpfangen,
                 g.ID AS GruppeID, coalesce(g.Name, 'Keine') AS GruppeName, m.LastImageChange
-            FROM " . self::TABLE_USERS . " m LEFT OUTER JOIN " . self::TABLE_GROUP . " g ON m.Gruppe = g.ID
+            FROM " . self::TABLE_USERS . ' m LEFT OUTER JOIN ' . self::TABLE_GROUP . ' g ON m.Gruppe = g.ID
             WHERE m.ID = :id
-            AND m.ID > 0");
+            AND m.ID > 0');
         $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getPlayerEspionageDataByID(int $blm_user): ?array
     {
-        $stmt = $this->prepare("SELECT ID, Name, Geld, " . getAllBuildingFields() . ", " . getAllStockFields() . "
-            FROM " . self::TABLE_USERS . " WHERE ID = :id");
+        $stmt = $this->prepare('SELECT ID, Name, Geld, ' . getAllBuildingFields() . ', ' . getAllStockFields() . '
+            FROM ' . self::TABLE_USERS . ' WHERE ID = :id');
         $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getGroupDiplomacyTypeById(int $left, int $right): ?int
     {
-        $stmt = $this->prepare("SELECT `Typ` FROM " . self::TABLE_GROUP_DIPLOMACY . " WHERE (Von = :left OR Von = :right) AND (An = :left OR An = :right) AND Aktiv = 1");
+        $stmt = $this->prepare('SELECT `Typ` FROM ' . self::TABLE_GROUP_DIPLOMACY . ' WHERE (Von = :left OR Von = :right) AND (An = :left OR An = :right) AND Aktiv = 1');
         $stmt->bindParam('left', $left, PDO::PARAM_INT);
         $stmt->bindParam('right', $right, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'Typ');
@@ -1348,18 +1348,18 @@ public function getGroupDiplomacyTypeById(int $left, int $right): ?int
 
     public function getGroupDiplomacyById(int $id): ?array
     {
-        $stmt = $this->prepare("SELECT d.*, gAn.ID AS GruppeAnId, gAn.Name AS GruppeAnName, gVon.ID AS GruppeVonId, gVon.Name AS GruppeVonName
-            FROM (" . self::TABLE_GROUP_DIPLOMACY . " d LEFT OUTER JOIN " . self::TABLE_GROUP . " gAn ON d.An = gAn.ID) LEFT OUTER JOIN " . self::TABLE_GROUP . " gVon ON gVon.ID = d.Von
-            WHERE d.ID = :id");
+        $stmt = $this->prepare('SELECT d.*, gAn.ID AS GruppeAnId, gAn.Name AS GruppeAnName, gVon.ID AS GruppeVonId, gVon.Name AS GruppeVonName
+            FROM (' . self::TABLE_GROUP_DIPLOMACY . ' d LEFT OUTER JOIN ' . self::TABLE_GROUP . ' gAn ON d.An = gAn.ID) LEFT OUTER JOIN ' . self::TABLE_GROUP . ' gVon ON gVon.ID = d.Von
+            WHERE d.ID = :id');
         $stmt->bindParam('id', $id, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
     }
 
     public function getGroupDiplomacyByIdAndAn(int $id, int $an): ?array
     {
-        $stmt = $this->prepare("SELECT d.*, gAn.ID AS GruppeAnId, gAn.Name AS GruppeAnName, gVon.ID AS GruppeVonId, gVon.Name AS GruppeVonName
-            FROM (" . self::TABLE_GROUP_DIPLOMACY . " d LEFT OUTER JOIN " . self::TABLE_GROUP . " gAn ON d.An = gAn.ID) LEFT OUTER JOIN " . self::TABLE_GROUP . " gVon ON gVon.ID = d.Von
-            WHERE d.ID = :id AND d.An = :an");
+        $stmt = $this->prepare('SELECT d.*, gAn.ID AS GruppeAnId, gAn.Name AS GruppeAnName, gVon.ID AS GruppeVonId, gVon.Name AS GruppeVonName
+            FROM (' . self::TABLE_GROUP_DIPLOMACY . ' d LEFT OUTER JOIN ' . self::TABLE_GROUP . ' gAn ON d.An = gAn.ID) LEFT OUTER JOIN ' . self::TABLE_GROUP . ' gVon ON gVon.ID = d.Von
+            WHERE d.ID = :id AND d.An = :an');
         $stmt->bindParam('id', $id, PDO::PARAM_INT);
         $stmt->bindParam('an', $an, PDO::PARAM_INT);
         return $this->executeAndExtractFirstRow($stmt);
@@ -1377,45 +1377,45 @@ public function getAllPlayerIdAndNameWhereMafiaPossible(float $myPoints, int $my
             $lowPoints = max(Config::getFloat(Config::SECTION_MAFIA, 'min_points'), $myPoints / $pointsRange);
             $highPoints = $myPoints * $pointsRange;
         }
-        $stmt = $this->prepare("SELECT ID, Name, Gruppe, Punkte
-FROM " . self::TABLE_USERS . " m
+        $stmt = $this->prepare('SELECT ID, Name, Gruppe, Punkte
+FROM ' . self::TABLE_USERS . ' m
 WHERE (
             coalesce(m.Gruppe, -2) != coalesce(:myGroup, -1) -- exclude my own group
-        AND m.ID != :myId -- exclude myself (if user isn't in a group)
+        AND m.ID != :myId -- exclude myself (if user is not in a group)
         AND (m.Punkte >= :lowPoints AND m.Punkte <= :highPoints -- include by points range
         AND m.Gruppe NOT IN -- exclude NAP and BND
             (SELECT d.Von
-             FROM " . self::TABLE_GROUP_DIPLOMACY . " d
+             FROM ' . self::TABLE_GROUP_DIPLOMACY . ' d
              WHERE d.Von = m.Gruppe
                AND d.An = coalesce(:myGroup, -1)
                AND d.Aktiv = 1
-               AND d.typ != " . group_diplomacy_war . "
+               AND d.typ != ' . group_diplomacy_war . '
              UNION
              SELECT d.An
-             FROM " . self::TABLE_GROUP_DIPLOMACY . " d
+             FROM ' . self::TABLE_GROUP_DIPLOMACY . ' d
              WHERE d.An = m.Gruppe
                AND d.Von = coalesce(:myGroup, -1)
                AND d.Aktiv = 1
-               AND d.typ != " . group_diplomacy_war . ")
+               AND d.typ != ' . group_diplomacy_war . ')
                 )
     )
    OR
    -- include all WAR opponents, regardless of points
         coalesce(m.Gruppe, -2) IN
         (SELECT d.Von
-         FROM " . self::TABLE_GROUP_DIPLOMACY . " d
+         FROM ' . self::TABLE_GROUP_DIPLOMACY . ' d
          WHERE d.Von = m.Gruppe
            AND d.An = coalesce(:myGroup, -1)
            AND d.Aktiv = 1
-           AND d.typ = " . group_diplomacy_war . "
+           AND d.typ = ' . group_diplomacy_war . '
          UNION
          SELECT d.An
-         FROM " . self::TABLE_GROUP_DIPLOMACY . " d
+         FROM ' . self::TABLE_GROUP_DIPLOMACY . ' d
          WHERE d.An = m.Gruppe
            AND d.Von = coalesce(:myGroup, -1)
            AND d.Aktiv = 1
-           AND d.typ = " . group_diplomacy_war . ")
-ORDER BY m.Name");
+           AND d.typ = ' . group_diplomacy_war . ')
+ORDER BY m.Name');
         $stmt->bindParam('myId', $myId, PDO::PARAM_INT);
         $stmt->bindParam('myGroup', $myGroup, PDO::PARAM_INT);
         $stmt->bindParam('lowPoints', $lowPoints);
@@ -1425,33 +1425,33 @@ public function getAllPlayerIdAndNameWhereMafiaPossible(float $myPoints, int $my
 
     public function updatePlayerOnlinezeit(int $blm_user): ?int
     {
-        $stmt = $this->prepare("UPDATE " . self::TABLE_USERS . " SET OnlineZeitSinceLastCron = OnlineZeitSinceLastCron + TIMESTAMPDIFF(SECOND, LastAction, NOW()), LastAction = NOW() WHERE ID = :id");
+        $stmt = $this->prepare('UPDATE ' . self::TABLE_USERS . ' SET OnlineZeitSinceLastCron = OnlineZeitSinceLastCron + TIMESTAMPDIFF(SECOND, LastAction, NOW()), LastAction = NOW() WHERE ID = :id');
         $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndGetAffectedRows($stmt);
     }
 
     public function updatePlayerOnlineTimes(): ?int
     {
-        return $this->executeAndGetAffectedRows($this->prepare("UPDATE " . self::TABLE_USERS . " SET OnlineZeit = OnlineZeit + OnlineZeitSinceLastCron, OnlineZeitSinceLastCron = 0"));
+        return $this->executeAndGetAffectedRows($this->prepare('UPDATE ' . self::TABLE_USERS . ' SET OnlineZeit = OnlineZeit + OnlineZeitSinceLastCron, OnlineZeitSinceLastCron = 0'));
     }
 
     public function updatePlayerPoints(): ?int
     {
-        $stmt = $this->prepare("UPDATE " . self::TABLE_STATISTICS . " s SET
-            s.GebaeudePlus = floor(s.AusgabenGebaeude / " . Config::getInt(Config::SECTION_BASE, 'expense_points_factor') . "),
-            s.ForschungPlus = floor(s.AusgabenForschung / " . Config::getInt(Config::SECTION_BASE, 'expense_points_factor') . "),
-            s.MafiaPlus = floor(s.AusgabenMafia / " . Config::getInt(Config::SECTION_BASE, 'expense_points_factor') . ")
-            WHERE s.user_id > 0");
+        $stmt = $this->prepare('UPDATE ' . self::TABLE_STATISTICS . ' s SET
+            s.GebaeudePlus = floor(s.AusgabenGebaeude / ' . Config::getInt(Config::SECTION_BASE, 'expense_points_factor') . '),
+            s.ForschungPlus = floor(s.AusgabenForschung / ' . Config::getInt(Config::SECTION_BASE, 'expense_points_factor') . '),
+            s.MafiaPlus = floor(s.AusgabenMafia / ' . Config::getInt(Config::SECTION_BASE, 'expense_points_factor') . ')
+            WHERE s.user_id > 0');
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return null;
         }
-        $stmt = $this->prepare("UPDATE " . self::TABLE_USERS . " m INNER JOIN " . self::TABLE_STATISTICS . " s ON m.ID = s.user_id SET
+        $stmt = $this->prepare('UPDATE ' . self::TABLE_USERS . ' m INNER JOIN ' . self::TABLE_STATISTICS . ' s ON m.ID = s.user_id SET
             m.Punkte = s.GebaeudePlus + s.ForschungPlus + s.MafiaPlus
-            WHERE m.ID > 0");
+            WHERE m.ID > 0');
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return null;
         }
-        $stmt = $this->prepare("UPDATE " . self::TABLE_RUNTIME_CONFIG . " SET
+        $stmt = $this->prepare('UPDATE ' . self::TABLE_RUNTIME_CONFIG . " SET
             conf_value = UNIX_TIMESTAMP()
             WHERE conf_name = 'lastpoints'");
         return $this->executeAndGetAffectedRows($stmt);
@@ -1459,7 +1459,7 @@ public function updatePlayerPoints(): ?int
 
     public function gdprCleanLoginLog(): ?int
     {
-        $stmt = $this->prepare("UPDATE " . self::TABLE_LOG_LOGIN . "
+        $stmt = $this->prepare('UPDATE ' . self::TABLE_LOG_LOGIN . "
             SET ip = concat('ANON_', CRC32(SHA1(SHA1(ip)))), anonymized = true
             WHERE anonymized = false AND created < date_sub(now(), interval 30 day)");
         return $this->executeAndGetAffectedRows($stmt);
@@ -1467,63 +1467,63 @@ public function gdprCleanLoginLog(): ?int
 
     public function updateLastCron(): ?int
     {
-        return $this->executeAndGetAffectedRows($this->prepare("REPLACE INTO " . self::TABLE_RUNTIME_CONFIG . " SET conf_name = 'lastcron', conf_value = UNIX_TIMESTAMP()"));
+        return $this->executeAndGetAffectedRows($this->prepare('REPLACE INTO ' . self::TABLE_RUNTIME_CONFIG . " SET conf_name = 'lastcron', conf_value = UNIX_TIMESTAMP()"));
     }
 
     public function countPendingGroupDiplomacy(int $group_id): ?int
     {
-        $stmt = $this->prepare("SELECT count(1) AS Count FROM " . self::TABLE_GROUP_DIPLOMACY . " WHERE An = :id AND Aktiv = 0");
+        $stmt = $this->prepare('SELECT count(1) AS Count FROM ' . self::TABLE_GROUP_DIPLOMACY . ' WHERE An = :id AND Aktiv = 0');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, 'Count');
     }
 
     public function deleteAllMessagesForUser(int $blm_user): ?int
     {
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_MESSAGES . " WHERE An = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_MESSAGES . ' WHERE An = :id');
         $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndGetAffectedRows($stmt);
     }
 
     public function getSitterPermissions(int $blm_user, string $right): ?string
     {
-        $stmt = $this->prepare("SELECT * FROM " . self::TABLE_SITTER . " WHERE user_id = :id");
+        $stmt = $this->prepare('SELECT * FROM ' . self::TABLE_SITTER . ' WHERE user_id = :id');
         $stmt->bindParam('id', $blm_user, PDO::PARAM_INT);
         return $this->executeAndExtractField($stmt, $right);
     }
 
     public function deleteGroup(int $group_id): ?string
     {
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_GROUP_DIPLOMACY . " WHERE Von = :id OR An = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_GROUP_DIPLOMACY . ' WHERE Von = :id OR An = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'gruppe_diplomatie';
         }
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_GROUP_LOG . " WHERE Gruppe = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_GROUP_LOG . ' WHERE Gruppe = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'gruppe_logbuch';
         }
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_GROUP_MESSAGES . " WHERE Gruppe = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_GROUP_MESSAGES . ' WHERE Gruppe = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'gruppe_nachrichten';
         }
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_GROUP_RIGHTS . " WHERE group_id = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_GROUP_RIGHTS . ' WHERE group_id = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'gruppe_rechte';
         }
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_GROUP_CASH . " WHERE group_id = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_GROUP_CASH . ' WHERE group_id = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'gruppe_kasse';
         }
-        $stmt = $this->prepare("DELETE FROM " . self::TABLE_GROUP . " WHERE ID = :id");
+        $stmt = $this->prepare('DELETE FROM ' . self::TABLE_GROUP . ' WHERE ID = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'gruppe';
         }
-        $stmt = $this->prepare("UPDATE " . self::TABLE_USERS . " SET Gruppe = NULL WHERE Gruppe = :id");
+        $stmt = $this->prepare('UPDATE ' . self::TABLE_USERS . ' SET Gruppe = NULL WHERE Gruppe = :id');
         $stmt->bindParam('id', $group_id, PDO::PARAM_INT);
         if ($this->executeAndGetAffectedRows($stmt) === null) {
             return 'mitglieder';
@@ -1550,7 +1550,7 @@ public function createUser(string $name, $email, ?string $email_activation_code,
 
     public function getInstallScriptChecksum(string $script): ?string
     {
-        $stmt = $this->prepare("SELECT Checksum FROM " . self::TABLE_UPDATE_INFO . " WHERE Script = :script");
+        $stmt = $this->prepare('SELECT Checksum FROM ' . self::TABLE_UPDATE_INFO . ' WHERE Script = :script');
         $stmt->bindParam('script', $script);
         return $this->executeAndExtractField($stmt, 'Checksum');
     }
@@ -1558,7 +1558,7 @@ public function getInstallScriptChecksum(string $script): ?string
     public function tableExists(string $table): bool
     {
         $db = Config::get(Config::SECTION_DATABASE, 'database');
-        $stmt = $this->prepare("SELECT count(1) as count FROM information_schema.TABLES WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table");
+        $stmt = $this->prepare('SELECT count(1) as count FROM information_schema.TABLES WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table');
         $stmt->bindParam('schema', $db);
         $stmt->bindParam('table', $table);
         return $this->executeAndExtractField($stmt, 'count') > 0;
@@ -1592,7 +1592,7 @@ public function selectForExport($table, $whereOr, $userId): ?array
             $conditions[] = sprintf('%s = :whr0', $whereOr);
             $fields['whr0'] = $userId;
         }
-        $sql = sprintf("SELECT * FROM %s WHERE %s", $table, implode(" OR ", $conditions));
+        $sql = sprintf('SELECT * FROM %s WHERE %s', $table, implode(' OR ', $conditions));
         return $this->executeAndExtractRows($this->prepare($sql), $fields);
     }
 
@@ -1605,23 +1605,23 @@ private function error($handle, string $text): void
     {
         $errorInfo = $handle->errorInfo();
         if (sizeof($errorInfo) > 0 && $errorInfo[0] != '00000') {
-            $text .= " (" . var_export($errorInfo, true) . ")";
+            $text .= ' (' . var_export($errorInfo, true) . ')';
         }
         $file = __FILE__;
         $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 5);
         for ($i = 1; $i < count($bt); $i++) {
-            if ($bt[$i]["file"] != $file) {
+            if ($bt[$i]['file'] != $file) {
                 break;
             }
         }
-        $text = str_replace(["\n ", "\n"], [" ", ""], $text);
-        error_log(sprintf("%s:%d | %s", basename($bt[$i]["file"]), $bt[$i]["line"], $text));
+        $text = str_replace(["\n ", "\n"], [' ', ''], $text);
+        error_log(sprintf('%s:%d | %s', basename($bt[$i]['file']), $bt[$i]['line'], $text));
     }
 
     private function executeAndExtractField(PDOStatement $stmt, string $fieldName, array $executeParam = array()): ?string
     {
         if (!($this->execute($stmt, $executeParam))) {
-            $this->error($stmt, "Could not execute statement");
+            $this->error($stmt, 'Could not execute statement');
             return null;
         }
         $result = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -1634,7 +1634,7 @@ private function executeAndExtractField(PDOStatement $stmt, string $fieldName, a
     public function executeAndGetAffectedRows(PDOStatement $stmt, array $executeParam = array()): ?int
     {
         if (!($this->execute($stmt, $executeParam))) {
-            $this->error($stmt, "Could not execute statement");
+            $this->error($stmt, 'Could not execute statement');
             return null;
         }
         return $stmt->rowCount();
@@ -1643,7 +1643,7 @@ public function executeAndGetAffectedRows(PDOStatement $stmt, array $executePara
     private function executeAndExtractRows(PDOStatement $stmt, array $executeParam = array()): ?array
     {
         if (!($this->execute($stmt, $executeParam))) {
-            $this->error($stmt, "Could not execute statement");
+            $this->error($stmt, 'Could not execute statement');
             return null;
         }
         $results = array();
@@ -1671,10 +1671,10 @@ private function prepare(string $sql): ?PDOStatement
         $stmt = $this->link->prepare($sql);
         $post = microtime(true);
         if ($post - $pre > $this->slow_query_threshold) {
-            $this->warnings[] = sprintf("Statement took %.02fms to prepare: %s", ($post - $pre) * 1000, $this->sql);
+            $this->warnings[] = sprintf('Statement took %.02fms to prepare: %s', ($post - $pre) * 1000, $this->sql);
         }
         if ($stmt === false) {
-            $this->error($this->link, "Could not prepare statement: " . $sql);
+            $this->error($this->link, 'Could not prepare statement: ' . $sql);
             return null;
         }
         return $stmt;
@@ -1684,10 +1684,10 @@ private function prepareAndBind(string $template, array $wheres = array()): ?PDO
     {
         $wheres = array_filter($wheres, fn($value) => $value !== null);
         if (empty($wheres)) {
-            return $this->prepare(str_replace("((1))", "1=1", $template));
+            return $this->prepare(str_replace('((1))', '1=1', $template));
         }
 
-        $sql = str_replace("((1))", implode(" AND ", array_keys($wheres)), $template);
+        $sql = str_replace('((1))', implode(' AND ', array_keys($wheres)), $template);
         $stmt = $this->prepare($sql);
         if ($stmt === null) return null;
 
@@ -1709,7 +1709,7 @@ private function execute(PDOStatement $stmt, array $executeParam = array()): boo
         }
         $post = microtime(true);
         if ($post - $pre > $this->slow_query_threshold) {
-            $this->warnings[] = sprintf("Statement took %.02fms to execute: %s", ($post - $pre) * 1000, $this->sql);
+            $this->warnings[] = sprintf('Statement took %.02fms to execute: %s', ($post - $pre) * 1000, $this->sql);
         }
         return $executeResult;
     }
diff --git a/include/functions.inc.php b/include/functions.inc.php
index e6ae7ed5..d8aff021 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -179,7 +179,8 @@ function getMessageBox(int $msg_id): ?string
             $text = 'Sie sind nicht angemeldet. Bitte melden Sie sich erst an.';
             break;
         case 103:
-            $text = 'Das Bild ist zu gross. Die maximale Grösse des Bildes ist ' . (Config::getInt(Config::SECTION_BASE, 'max_profile_image_size') / 1024) . ' KB.';
+            $text = sprintf('Das Bild ist zu gross. Die maximale Grösse des Bildes ist %d KB.',
+                Config::getInt(Config::SECTION_BASE, 'max_profile_image_size') / 1024);
             break;
         case 104:
             $text = 'Bitte füllen Sie alle Felder aus.';
@@ -263,52 +264,59 @@ function getMessageBox(int $msg_id): ?string
             $text = 'Der Kontostand des Mitglieds ist bereits auf dem Maximum, die Bank weigert sich die Überweisung anzunehmen!';
             break;
         case 132:
-            $text = 'Bei einem Krieg muss der Betrag, um welchen gekämpft wird, größer als ' . formatCurrency(Config::getInt(Config::SECTION_GROUP, 'war_min_amount')) . ' sein!';
+            $text = sprintf('Bei einem Krieg muss der Betrag, um welchen gekämpft wird, größer als %s sein!',
+                formatCurrency(Config::getInt(Config::SECTION_GROUP, 'war_min_amount')));
             break;
         case 133:
-            $text = "Bitte geben Sie eine Dauer zwischen 1 und " . Config::getInt(Config::SECTION_PLANTAGE, 'production_hours_max') . " Stunden ein!";
+            $text = sprintf('Bitte geben Sie eine Dauer zwischen 1 und %s Stunden ein!',
+                Config::getInt(Config::SECTION_PLANTAGE, 'production_hours_max'));
             break;
         case 134:
-            $text = "Bitte geben Sie eine gültige EMail-Adresse ein!";
+            $text = 'Bitte geben Sie eine gültige EMail-Adresse ein!';
             break;
         case 135:
-            $text = "Ihr Account ist noch nicht aktiviert.<br />Bitte klicken Sie auf den Link, den Sie per EMail erhalten haben.<br />Falls Sie keinen Link erhalten haben, so wenden Sie sich bitte mit Ihrem Benutzernamen und <br />der registrierten EMailadresse als Absender an die im Impressum angegebene Adresse.";
+            $text = 'Ihr Account ist noch nicht aktiviert.<br />Bitte klicken Sie auf den Link, den Sie per EMail erhalten haben.<br />Falls Sie keinen Link erhalten haben, so wenden Sie sich bitte mit Ihrem Benutzernamen und <br />der registrierten EMailadresse als Absender an die im Impressum angegebene Adresse.';
             break;
         case 136:
-            $text = "Bitte geben Sie ein Sitterpasswort ein!";
+            $text = 'Bitte geben Sie ein Sitterpasswort ein!';
             break;
         case 137:
-            $text = "Es ist Weihnachten. Die Mafiabosse haben untereinander bis zum Ende der Feiertage einen Waffenstillstand geschlossen.";
+            $text = 'Es ist Weihnachten. Die Mafiabosse haben untereinander bis zum Ende der Feiertage einen Waffenstillstand geschlossen.';
             break;
         case 138:
-            $text = "Sitter dürfen beim Spiel nicht teilnehmen, tut mir Leid...";
+            $text = 'Sitter dürfen beim Spiel nicht teilnehmen, tut mir Leid...';
             break;
         case 139:
-            $text = "Ihr Account wurde von einem Administrator gesperrt. Bitte kontaktieren Sie einen Administrator im Forum für weitere Informationen. Falls diese Sperre dauerhaft ist, dann wird Ihr Account zwei Wochen nach Beginn der Sperre gelöscht.";
+            $text = 'Ihr Account wurde von einem Administrator gesperrt. Bitte kontaktieren Sie einen Administrator im Forum für weitere Informationen. Falls diese Sperre dauerhaft ist, dann wird Ihr Account zwei Wochen nach Beginn der Sperre gelöscht.';
             break;
         case 140:
-            $text = "Die Gruppe wurde gefunden und das Passwort ist korrekt, jedoch hat die Gruppe die maximale Mitgliederzahl schon erreicht.";
+            $text = 'Die Gruppe wurde gefunden und das Passwort ist korrekt, jedoch hat die Gruppe die maximale Mitgliederzahl schon erreicht.';
             break;
         case 141:
-            $text = "Datenbankfehler, konnte neuen Eintrag nicht anlegen";
+            $text = 'Datenbankfehler, konnte neuen Eintrag nicht anlegen';
             break;
         case 142:
-            $text = "Datenbankfehler, konnte bestehenden Eintrag nicht bearbeiten";
+            $text = 'Datenbankfehler, konnte bestehenden Eintrag nicht bearbeiten';
             break;
         case 143:
-            $text = "Datenbankfehler, konnte bestehenden Eintrag nicht löschen";
+            $text = 'Datenbankfehler, konnte bestehenden Eintrag nicht löschen';
             break;
         case 144:
-            $text = sprintf('Der neue Benutzer wurde zwar erstellt, jedoch konnte die Aktivierungsmail nicht versendet werden. Bitte wende dich per EMail an den Admin: <a href="mailto:%s">%s</a>', Config::get(Config::SECTION_BASE, 'admin_email'), Config::get(Config::SECTION_BASE, 'admin_email'));
+            $text = sprintf('Der neue Benutzer wurde zwar erstellt, jedoch konnte die Aktivierungsmail nicht versendet werden. Bitte wende dich per EMail an den Admin: <a href="mailto:%s">%s</a>',
+                Config::get(Config::SECTION_BASE, 'admin_email'),
+                Config::get(Config::SECTION_BASE, 'admin_email'));
             break;
         case 145:
             $text = 'Sie müssen zuerst mal ein Forschungszentrum bauen, bevor Sie Forschungen starten können!';
             break;
         case 146:
-            $text = 'Der Benutzername darf nur zwischen ' . Config::getInt(Config::SECTION_BASE, 'username_min_len') . ' und ' . Config::getInt(Config::SECTION_BASE, 'username_max_len') . ' Zeichen enthalten';
+            $text = sprintf('Der Benutzername darf nur zwischen %s und %s Zeichen enthalten',
+                Config::getInt(Config::SECTION_BASE, 'username_min_len'),
+                Config::getInt(Config::SECTION_BASE, 'username_max_len'));
             break;
         case 147:
-            $text = 'Das gewählte Passwort ist zu kurz, es muss mindestens aus ' . Config::getInt(Config::SECTION_BASE, 'password_min_len') . ' Zeichen bestehen.';
+            $text = sprintf('Das gewählte Passwort ist zu kurz, es muss mindestens aus %s Zeichen bestehen.',
+                Config::getInt(Config::SECTION_BASE, 'password_min_len'));
             break;
         case 148:
             $text = 'Die Registrierung ist aktuell geschlossen';
@@ -341,10 +349,12 @@ function getMessageBox(int $msg_id): ?string
             $text = 'Sie befinden sich bereits in einer Gruppe';
             break;
         case 158:
-            $text = 'Ungültiger Gruppenname (Darf nur maximal ' . Config::getInt(Config::SECTION_GROUP, 'max_name_length') . ' Zeichen lang sein)';
+            $text = sprintf('Ungültiger Gruppenname (Darf nur maximal %s Zeichen lang sein)',
+                Config::getInt(Config::SECTION_GROUP, 'max_name_length'));
             break;
         case 159:
-            $text = 'Ungültiges Gruppenkürzel  (Darf nur maximal ' . Config::getInt(Config::SECTION_GROUP, 'max_tag_length') . ' Zeichen lang sein)';
+            $text = sprintf('Ungültiges Gruppenkürzel (Darf nur maximal %s Zeichen lang sein)',
+                Config::getInt(Config::SECTION_GROUP, 'max_tag_length'));
             break;
         case 160:
             $text = 'Token in Anfrage nicht gefunden, Aktion verweigert';
@@ -368,13 +378,15 @@ function getMessageBox(int $msg_id): ?string
             $text = 'In der Gruppenkasse befindet sich genügend Geld für den Krieg';
             break;
         case 167:
-            $text = 'Eine diplomatische Beziehung kann erst nach frühestens ' . Config::getInt(Config::SECTION_GROUP, 'diplomacy_min_duration') . ' Tagen aufgekündigt werden';
+            $text = sprintf('Eine diplomatische Beziehung kann erst nach frühestens %s Tagen aufgekündigt werden',
+                Config::getInt(Config::SECTION_GROUP, 'diplomacy_min_duration'));
             break;
         case 168:
             $text = 'Sie können sich selbst keine Nachrichten schicken!';
             break;
         case 169:
-            $text = 'Die Mafia ist erst ab ' . formatPoints(Config::getFloat(Config::SECTION_MAFIA, 'min_points')) . ' Punkten verfügbar';
+            $text = sprintf('Die Mafia ist erst ab %s Punkten verfügbar',
+                formatPoints(Config::getFloat(Config::SECTION_MAFIA, 'min_points')));
             break;
         case 170:
             $text = 'Die Mafia erholt sich noch vom letzten Auftrag.';
@@ -537,7 +549,8 @@ function getMessageBox(int $msg_id): ?string
 
 
         case 999:
-            $text = sprintf('Das Spiel ist zur Zeit pausiert.<br />Die neue Runde startet am %s', date("d.m.Y \u\m H:i", Config::getInt(Config::SECTION_DBCONF, 'roundstart')));
+            $text = sprintf('Das Spiel ist zur Zeit pausiert.<br />Die neue Runde startet am %s',
+                date('d.m.Y \u\m H:i', Config::getInt(Config::SECTION_DBCONF, 'roundstart')));
             break;
         default:
             $text = sprintf('Meldungsnummer konnte nicht gefunden werden: %d', $msg_id);
@@ -638,9 +651,9 @@ function isLoggedIn(): bool
 function getYesOrNo(int $bool): string
 {
     if ($bool == 0)
-        return "Nein";
+        return 'Nein';
     else
-        return "Ja";
+        return 'Ja';
 }
 
 function replaceBBCode(string $text): string
@@ -649,10 +662,10 @@ function replaceBBCode(string $text): string
     $result = preg_replace(
         array(
             '/\[center](.*)\[\/center]/Uis',
-            "/\[url=&quot;(https?:\/\/|www.|https?:\/\/www.)([a-z\d\-_.]{3,32}\.[a-z]{2,4})&quot;](.*)\[\/url]/SiU",
-            "/\[img=&quot;(https?:\/\/[a-z\d\-_.\/]{3,32}\.[a-z]{3,4})&quot;](.*)\[\/img]/SiU",
-            "@\[player=(.+)#(\d{1,8})/]@SUi",
-            "@\[group=(.+)#(\d{1,8})/]@SUi",
+            '/\[url=&quot;(https?:\/\/|www.|https?:\/\/www.)([a-z\d\-_.]{3,32}\.[a-z]{2,4})&quot;](.*)\[\/url]/SiU',
+            '/\[img=&quot;(https?:\/\/[a-z\d\-_.\/]{3,32}\.[a-z]{3,4})&quot;](.*)\[\/img]/SiU',
+            '@\[player=(.+)#(\d{1,8})/]@SUi',
+            '@\[group=(.+)#(\d{1,8})/]@SUi',
         ),
         array(
             '<div class="center">\1</div>',
@@ -671,8 +684,8 @@ function replaceBBCode(string $text): string
 
         $result = preg_replace(
             array(
-                "/\[color=red](.*)\[\/color]/is",
-                "/\[([bui])](.*)\[\/\\1]/Uis",
+                '/\[color=red](.*)\[\/color]/is',
+                '/\[([bui])](.*)\[\/\\1]/Uis',
                 '/\[quote](.*)\[\/quote]/Uism'
             ),
             array(
@@ -712,7 +725,7 @@ function deleteAccount(int $blm_user): ?string
     }
 
     // delete his profile picture
-    @unlink(sprintf("../pics/uploads/u_%d.webp", $blm_user));
+    @unlink(sprintf('../pics/uploads/u_%d.webp', $blm_user));
     return null;
 }
 
@@ -721,14 +734,14 @@ function resetAccount(int $blm_user): ?string
     // delete group if the user is the only member
     $player = Database::getInstance()->getPlayerNameAndGroupIdAndGroupRightsById($blm_user);
     if ($player === null) {
-        return "loading player";
+        return 'loading player';
     }
     if ($player['Gruppe'] !== null && Database::getInstance()->getGroupMemberCountById($player['Gruppe']) == 1) {
         $status = Database::getInstance()->deleteGroup($player['Gruppe']);
         if ($status !== null) {
             return 'delete_group_' . $status;
         }
-        @unlink(sprintf("../pics/uploads/g_%d.webp", $player['Gruppe']));
+        @unlink(sprintf('../pics/uploads/g_%d.webp', $player['Gruppe']));
     }
 
     // reset all values to the starting defaults
@@ -789,7 +802,7 @@ function updateLastAction(): void
 
 function escapeForOutput(?string $text, bool $withNl2Br = true): string
 {
-    if ($text === null) return "";
+    if ($text === null) return '';
     $data = htmlentities(stripslashes($text), ENT_QUOTES, 'UTF-8');
     if ($withNl2Br) {
         return nl2br($data);
@@ -807,7 +820,7 @@ function getOrDefault(array $array, string $name, $default = null)
         } else if (is_string($default)) {
             return $value;
         } else if (is_integer($default)) {
-            if ($value === "") return $default;
+            if ($value === '') return $default;
             else return intval($value);
         } else if (is_double($default) || is_float($default)) {
             return doubleval(str_replace(',', '.', $value));
@@ -862,13 +875,13 @@ function formatWeight(float $amount, bool $withSuffix = true, int $decimals = 0,
 
 function formatPoints(int $amount): string
 {
-    return number_format($amount, 0, "", ".");
+    return number_format($amount, 0, '', '.');
 }
 
 function formatDate(int $date): string
 {
     if ($date > 0) {
-        return date("d.m.Y", $date);
+        return date('d.m.Y', $date);
     } else {
         return 'Nie';
     }
@@ -879,12 +892,12 @@ function formatDateTime(?int $date): string
     if ($date === null)
         return 'Jetzt';
     else
-        return date("d.m.Y H:i:s", $date);
+        return date('d.m.Y H:i:s', $date);
 }
 
 function formatTime(int $date): string
 {
-    return date("H:i:s", $date);
+    return date('H:i:s', $date);
 }
 
 function formatDuration(int $amount, bool $withHours = true): string
@@ -913,16 +926,16 @@ function createPaginationTable(string $linkBase, int $currentPage, int $entriesC
         $page = floor($i / $entriesPerPage);
         if ($page != $currentPage) {
             $pages[] = sprintf('<a href="%s&amp;%s=%d%s">%d</a>',
-                $linkBase, $offsetField, $page, $anchor == null ? '' : "#$anchor", $page + 1);
+                $linkBase, $offsetField, $page, $anchor == null ? '' : '#$anchor', $page + 1);
         } else {
             $pages[] = $page + 1;
         }
     }
     if (count($pages) == 0) {
-        $pages[] = "1";
+        $pages[] = '1';
     }
 
-    return sprintf('<div class="Pagination">Seite: %s</div>', implode(" | ", $pages));
+    return sprintf('<div class="Pagination">Seite: %s</div>', implode(' | ', $pages));
 }
 
 function createDropdown(array $elementsWithIDAndName, ?int $selectedID, string $elementName, bool $withAllEntry = true, bool $withSystemEntry = false, bool $withNoneEntry = false): string
@@ -943,10 +956,10 @@ function createDropdown(array $elementsWithIDAndName, ?int $selectedID, string $
     }
     for ($i = 0; $i < count($elementsWithIDAndName); $i++) {
         $entry = $elementsWithIDAndName[$i];
-        if ($entry["ID"] == $selectedID) {
-            $entries[] = sprintf('<option value="%d" selected>%s</option>', $entry["ID"], $entry["Name"]);
+        if ($entry['ID'] == $selectedID) {
+            $entries[] = sprintf('<option value="%d" selected>%s</option>', $entry['ID'], $entry['Name']);
         } else {
-            $entries[] = sprintf('<option value="%d">%s</option>', $entry["ID"], $entry["Name"]);
+            $entries[] = sprintf('<option value="%d">%s</option>', $entry['ID'], $entry['Name']);
         }
     }
     return sprintf('<select name="%s">%s</select>', $elementName, implode("\n", $entries));
@@ -973,10 +986,10 @@ function redirectTo(string $location, ?int $m = null, ?string $anchor = null): v
 {
     $location = preg_replace('/&m=(\\d+)/', '', $location);
     if ($m != null) {
-        $location .= "&m=" . $m;
+        $location .= '&m=' . $m;
     }
     if ($anchor != null) {
-        $location .= "#" . urlencode($anchor);
+        $location .= '#' . urlencode($anchor);
     }
     header('Location: ' . $location, true, 303);
     die();
@@ -1011,24 +1024,24 @@ function requireEntryFound($result, string $redirectTo, int $m = 154, ?string $a
 function requireAdmin(): void
 {
     if (!isAdmin()) {
-        redirectTo("/?p=index", 112, __LINE__);
+        redirectTo('/?p=index', 112, __LINE__);
     }
 }
 
 function requireLogin(): void
 {
     if (!isLoggedIn()) {
-        redirectTo("/?p=index", 102, __LINE__);
+        redirectTo('/?p=index', 102, __LINE__);
     }
 }
 
 function isAccessAllowedIfSitter(?string $requiredRight): bool
 {
     if ($requiredRight === null) return true;
-    return !$_SESSION['blm_sitter'] || Database::getInstance()->getSitterPermissions($_SESSION['blm_user'], $requiredRight) === "1";
+    return !$_SESSION['blm_sitter'] || Database::getInstance()->getSitterPermissions($_SESSION['blm_user'], $requiredRight) === '1';
 }
 
-function restrictSitter(string $requiredRight, string $backPage = "index"): void
+function restrictSitter(string $requiredRight, string $backPage = 'index'): void
 {
     if (!isAccessAllowedIfSitter($requiredRight)) {
         redirectTo('/?p=' . $backPage, 112, __LINE__);
@@ -1038,7 +1051,7 @@ function restrictSitter(string $requiredRight, string $backPage = "index"): void
 function createRandomCode(): string
 {
     if (Config::getBoolean(Config::SECTION_BASE, 'testing')) {
-        // "changeit"
+        // sha1('changeit')
         return '07313f0e320f22cbfa35cfc220508eb3ff457c7e';
     }
     return sha1(openssl_random_pseudo_bytes(32));
@@ -1079,9 +1092,9 @@ function createNavigationLink(string $target, string $text, ?string $sitterRight
 {
     if (isAccessAllowedIfSitter($sitterRightsRequired)) {
         return sprintf('<div class="NaviLink"><a href="/?p=%s" id="link_%s" class="%s">%s</a></div>%s',
-            $target, $target, $target === getCurrentPage() ? "active" : "inactive", $text, "\n");
+            $target, $target, $target === getCurrentPage() ? 'active' : 'inactive', $text, "\n");
     }
-    return "";
+    return '';
 }
 
 function createHelpLink(int $module, int $category): string
@@ -1089,7 +1102,7 @@ function createHelpLink(int $module, int $category): string
     if (isLoggedIn()) {
         return sprintf(' <a href="/?p=hilfe&amp;mod=%d&amp;cat=%d" id="link_show_help"><img id="help_image" src="/pics/style/help.webp" alt="Hilfe" /></a>', $module, $category);
     }
-    return "";
+    return '';
 }
 
 function getCurrentPage(): string
@@ -1097,81 +1110,81 @@ function getCurrentPage(): string
     $p = array_key_exists('p', $_GET) ? $_GET['p'] : 'index';
     if (isLoggedIn()) {
         switch ($p) {
-            case "admin":
-            case "admin_benutzer":
-            case "admin_benutzer_bearbeiten":
-            case "admin_gruppe":
-            case "admin_gruppe_bearbeiten":
-            case "admin_test":
-            case "admin_markt":
-            case "admin_vertrag":
-            case "admin_vertrag_einstellen":
-            case "admin_vertrag_bearbeiten":
-            case "admin_markt_einstellen":
-            case "admin_markt_bearbeiten":
-            case "admin_log_bank":
-            case "admin_log_bioladen":
-            case "admin_log_gruppenkasse":
-            case "admin_log_login":
-            case "admin_log_mafia":
-            case "admin_log_marktplatz":
-            case "admin_log_nachrichten":
-            case "admin_log_vertraege":
+            case 'admin':
+            case 'admin_benutzer':
+            case 'admin_benutzer_bearbeiten':
+            case 'admin_gruppe':
+            case 'admin_gruppe_bearbeiten':
+            case 'admin_test':
+            case 'admin_markt':
+            case 'admin_vertrag':
+            case 'admin_vertrag_einstellen':
+            case 'admin_vertrag_bearbeiten':
+            case 'admin_markt_einstellen':
+            case 'admin_markt_bearbeiten':
+            case 'admin_log_bank':
+            case 'admin_log_bioladen':
+            case 'admin_log_gruppenkasse':
+            case 'admin_log_login':
+            case 'admin_log_mafia':
+            case 'admin_log_marktplatz':
+            case 'admin_log_nachrichten':
+            case 'admin_log_vertraege':
                 if (!isAdmin()) {
                     redirectTo('/?p=index', 101, __LINE__);
                 }
                 $page = $p;
                 break;
-            case "bank":
-            case "bioladen":
-            case "buero":
-            case "forschungszentrum":
-            case "gebaeude":
-            case "marktplatz_liste":
-            case "marktplatz_verkaufen":
-            case "plantage":
-            case "vertraege_liste":
-            case "vertraege_neu":
-            case "mafia":
-            case "statistik":
-            case "gruppe":
-            case "gruppe_einstellungen":
-            case "gruppe_mitgliederverwaltung":
-            case "gruppe_diplomatie":
-            case "gruppe_kasse":
-            case "gruppe_logbuch":
-            case "gruppe_krieg_details":
-            case "rangliste":
-            case "rangliste_spezial":
-            case "index":
-            case "impressum":
-            case "regeln":
-            case "einstellungen":
-            case "nachrichten_lesen":
-            case "nachrichten_liste":
-            case "nachrichten_schreiben":
-            case "notizblock":
-            case "hilfe":
-            case "profil":
-            case "special":
+            case 'bank':
+            case 'bioladen':
+            case 'buero':
+            case 'forschungszentrum':
+            case 'gebaeude':
+            case 'marktplatz_liste':
+            case 'marktplatz_verkaufen':
+            case 'plantage':
+            case 'vertraege_liste':
+            case 'vertraege_neu':
+            case 'mafia':
+            case 'statistik':
+            case 'gruppe':
+            case 'gruppe_einstellungen':
+            case 'gruppe_mitgliederverwaltung':
+            case 'gruppe_diplomatie':
+            case 'gruppe_kasse':
+            case 'gruppe_logbuch':
+            case 'gruppe_krieg_details':
+            case 'rangliste':
+            case 'rangliste_spezial':
+            case 'index':
+            case 'impressum':
+            case 'regeln':
+            case 'einstellungen':
+            case 'nachrichten_lesen':
+            case 'nachrichten_liste':
+            case 'nachrichten_schreiben':
+            case 'notizblock':
+            case 'hilfe':
+            case 'profil':
+            case 'special':
                 $page = $p;
                 break;
             default:
-                $page = "index";
+                $page = 'index';
                 break;
         }
     } else {
         switch ($p) {
-            case "anmelden":
-            case "registrieren":
-            case "index":
-            case "passwort_vergessen":
-            case "regeln":
-            case "impressum":
+            case 'anmelden':
+            case 'registrieren':
+            case 'index':
+            case 'passwort_vergessen':
+            case 'regeln':
+            case 'impressum':
                 $page = $p;
                 break;
             default:
-                $page = "index";
+                $page = 'index';
                 break;
         }
     }
@@ -1297,7 +1310,7 @@ function calculateSellRates(): array
     if (Config::getBoolean(Config::SECTION_BASE, 'testing')) {
         mt_srand(1337);
     } else {
-        mt_srand(intval(date("ymdH", time())) + crc32(Config::get(Config::SECTION_BASE, 'random_secret')));
+        mt_srand(intval(date('ymdH', time())) + crc32(Config::get(Config::SECTION_BASE, 'random_secret')));
     }
     $result = array();
     for ($i = 1; $i <= count_wares; $i++) {
@@ -1312,7 +1325,7 @@ function calculateInterestRates(): array
     if (Config::getBoolean(Config::SECTION_BASE, 'testing')) {
         mt_srand(1337);
     } else {
-        mt_srand(intval(date("ymd", time())) + crc32(Config::get(Config::SECTION_BASE, 'random_secret')));
+        mt_srand(intval(date('ymd', time())) + crc32(Config::get(Config::SECTION_BASE, 'random_secret')));
     }
     $result = array(
         'Debit' => getRandomRate(Config::getFloat(Config::SECTION_BANK, 'interest_debit_rate_min'), Config::getFloat(Config::SECTION_BANK, 'interest_debit_rate_max')),
@@ -1349,12 +1362,12 @@ function getIncome(int $shop_level, int $kebab_stand_level): int
 
 function createBBProfileLink(int $user_id, string $user_name): string
 {
-    return sprintf("[player=%s#%d/]", $user_name, $user_id);
+    return sprintf('[player=%s#%d/]', $user_name, $user_id);
 }
 
 function createBBGroupLink(int $group_id, string $group_name): string
 {
-    return sprintf("[group=%s#%d/]", $group_name, $group_id);
+    return sprintf('[group=%s#%d/]', $group_name, $group_id);
 }
 
 function createGroupNaviation(int $activePage, int $group_id): string
@@ -1384,7 +1397,7 @@ function createGroupNaviation(int $activePage, int $group_id): string
     return sprintf('<div id="GroupNavigation">%s</div>
 <script nonce="' . getCspNonce() . '">
     document.getElementById(\'leave_group\').onclick = () => confirm(\'Wollen Sie wirklich aus der Gruppe austreten?\');
-</script>', implode(" | ", $items));
+</script>', implode(' | ', $items));
 }
 
 function getGroupDiplomacyTypeName(int $id): string
@@ -1521,7 +1534,7 @@ function handleRoundEnd(): void
     foreach ($players as $player) {
         if ($player['EMailAct'] !== null || $player['LastLogin'] === null) continue;
         if (!sendMail($player['EMail'], Config::get(Config::SECTION_BASE, 'game_title') . ': Rundenende', str_replace('__NAME__', escapeForOutput($player['Name']), $mail))) {
-            trigger_error(sprintf("Could not send mail to %s", $player['EMail']), E_USER_WARNING);
+            trigger_error(sprintf('Could not send mail to %s', $player['EMail']), E_USER_WARNING);
         }
     }
 }
@@ -1637,7 +1650,7 @@ function getMafiaConfigSection(int $action): string
 
 function getMafiaChance(string $cfgSection, int $level, int $pizzeriaLevel = 0, int $fenceLevel = 0): float
 {
-    $chance = floatval(Config::get($cfgSection, "chance")[$level]);
+    $chance = floatval(Config::get($cfgSection, 'chance')[$level]);
     $chance += $pizzeriaLevel * Config::getFloat(Config::SECTION_PIZZERIA, 'mafia_bonus');
     $chance -= $fenceLevel * Config::getFloat(Config::SECTION_FENCE, 'mafia_bonus');
     if (Config::getBoolean(Config::SECTION_BASE, 'testing')) {
@@ -1718,7 +1731,7 @@ function getAllFields(string $prefix, int $count, string $separator = ','): stri
 date_default_timezone_set(Config::get(Config::SECTION_BASE, 'timezone'));
 
 // check for maintenance
-if (Config::getBoolean(Config::SECTION_BASE, "maintenance_active")) {
+if (Config::getBoolean(Config::SECTION_BASE, 'maintenance_active')) {
     if (defined('IS_CRON')) {
         die("Maintenance active\n");
     } else {
diff --git a/include/game_version.inc.php b/include/game_version.inc.php
index b081e185..e259aa78 100644
--- a/include/game_version.inc.php
+++ b/include/game_version.inc.php
@@ -20,4 +20,4 @@ function getVersionExtra()
     return $version_extra;
 }
 
-define('game_version', "1.11.5" . getVersionExtra());
+define('game_version', '1.11.5' . getVersionExtra());
diff --git a/index.php b/index.php
index 5416a63c..8595a119 100644
--- a/index.php
+++ b/index.php
@@ -60,7 +60,7 @@
 sendCspHeader();
 ?><!DOCTYPE html>
 <!--
-	Site generated:   <?= date("r", time()) . "\n"; ?>
+	Site generated:   <?= date('r', time()) . "\n"; ?>
 	Client:           <?= escapeForOutput($_SERVER['REMOTE_ADDR']) . "\n"; ?>
 	Server:           <?= escapeForOutput($_SERVER['SERVER_ADDR']) . "\n"; ?>
 	Script:           <?= escapeForOutput($_SERVER['PHP_SELF']) . "\n"; ?>
@@ -198,7 +198,7 @@
     <div id="Footer">
         <div>Bioladenmanager 2 Version <?= game_version; ?></div>
         <div><a href="/?p=impressum">© 2007-2023, Simon Frankenberger</a></div>
-        <div>Letzte Änderung: <?= date("d.m.Y H:i", filemtime(__DIR__ . '/include/game_version.inc.php')); ?></div>
+        <div>Letzte Änderung: <?= date('d.m.Y H:i', filemtime(__DIR__ . '/include/game_version.inc.php')); ?></div>
     </div>
 </div>
 <script nonce="<?= getCspNonce(); ?>">
@@ -213,7 +213,7 @@
     ?>
     let links = document.getElementById('Navigation').getElementsByTagName('a');
     for (let link of links) {
-        if (link.classList.contains("inactive")) {
+        if (link.classList.contains('inactive')) {
             link.href += '#Inhalt';
         }
     }
@@ -227,7 +227,7 @@
 $dauer = 1000 * (microtime(true) - $start);
 ?>
 <!--
-PLT:     <?= number_format($dauer, 2) . "ms\n"; ?>
+PLT:     <?= number_format($dauer, 2); ?>ms
 Queries: <?= Database::getInstance()->getQueryCount() . "\n"; ?>
 <?php
 $warnings = Database::getInstance()->getWarnings();
diff --git a/install/update.php b/install/update.php
index e41552b3..bab156be 100644
--- a/install/update.php
+++ b/install/update.php
@@ -43,10 +43,10 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
 
 
 require_once '../include/game_version.inc.php';
-$step = sprintf("Checking installation for version %s:", game_version);
+$step = sprintf('Checking installation for version %s:', game_version);
 {
     if (!file_exists('../config/config.ini')) {
-        print_status($step, status_fail, "config/config.ini not found");
+        print_status($step, status_fail, 'config/config.ini not found');
     }
     print_status($step, status_ok);
 }
@@ -54,16 +54,16 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
 require_once '../include/functions.inc.php';
 require_once '../include/database.class.php';
 
-$step = "Verifying upgrade credentials";
+$step = 'Verifying upgrade credentials';
 {
     if (php_sapi_name() !== 'cli' && getOrDefault($_GET, 'secret', 'unset') !== Config::get(Config::SECTION_BASE, 'upgrade_secret')) {
         http_response_code(401);
-        print_status($step, status_fail, "invalid credentials");
+        print_status($step, status_fail, 'invalid credentials');
     }
-    print_status($step, status_ok, sprintf("Called by %s", php_sapi_name()));
+    print_status($step, status_ok, sprintf('Called by %s', php_sapi_name()));
 }
 
-$step = "Verifying secrets changed";
+$step = 'Verifying secrets changed';
 {
     if (Config::get(Config::SECTION_BASE, 'upgrade_secret') == Config::get(Config::SECTION_BASE, 'random_secret')) {
         http_response_code(401);
@@ -72,7 +72,7 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     print_status($step, status_ok);
 }
 
-$step = "Verifying database connection";
+$step = 'Verifying database connection';
 $database = null;
 {
     try {
@@ -83,19 +83,19 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     print_status($step, status_ok);
 }
 
-$step = "Checking base installation";
+$step = 'Checking base installation';
 $executedScripts = array();
 {
     if (!$database->tableExists('auftrag')) {
         print_status($step, status_needs_upgrade);
 
-        $step = "Executing basic setup script";
+        $step = 'Executing basic setup script';
         {
             // initial setup
             $script = 'sql/00-1.10.0-setup.sql';
             $result = $database->executeFile($script);
             if ($result !== null) {
-                print_status($step, status_fail, sprintf("Could not execute setup script, failed step: %s", $result));
+                print_status($step, status_fail, sprintf('Could not execute setup script, failed step: %s', $result));
             }
             $executedScripts[$script] = sha1_file($script);
         }
@@ -103,17 +103,17 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     print_status($step, status_ok);
 }
 
-$step = "Checking for update information";
+$step = 'Checking for update information';
 {
     if (!$database->tableExists('update_info')) {
         print_status($step, status_needs_upgrade);
 
-        $step = "Creating initial update information";
+        $step = 'Creating initial update information';
         {  // coming from v1.10.0
             $script = 'sql/01-1.10.1-update_info.sql';
             $result = $database->executeFile($script);
             if ($result !== null) {
-                print_status($step, status_fail, sprintf("Could not execute setup script, failed step: %s", $result));
+                print_status($step, status_fail, sprintf('Could not execute setup script, failed step: %s', $result));
             }
             $executedScripts[$script] = sha1_file($script);
         }
@@ -121,20 +121,20 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     print_status($step, status_ok);
 }
 
-$step = "Enumerating update scripts";
+$step = 'Enumerating update scripts';
 $scripts = array();
 {
     $scripts = glob('sql/*.sql');
     if ($scripts === false) {
-        print_status($step, status_fail, sprintf("Could not list scripts in install/sql/, please check access permissions"));
+        print_status($step, status_fail, sprintf('Could not list scripts in install/sql/, please check access permissions'));
     }
     sort($scripts);
-    print_status($step, status_ok, sprintf("Found %d scripts", count($scripts)));
+    print_status($step, status_ok, sprintf('Found %d scripts', count($scripts)));
 }
 
 
 foreach ($scripts as $script) {
-    $step = sprintf("Checking %s", basename($script));
+    $step = sprintf('Checking %s', basename($script));
     {
         if (strpos(basename($script), '0') === 0) {
             print_status($step, status_ok, 'skipped');
@@ -143,20 +143,20 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
 
         $dbChecksum = $database->getInstallScriptChecksum($script);
         if ($dbChecksum === null) {
-            $step = sprintf("Executing new %s", $script);
+            $step = sprintf('Executing new %s', $script);
             {
                 $result = $database->executeFile($script);
                 if ($result !== null) {
-                    print_status($step, status_fail, sprintf("Could not execute setup script, failed step: %s", $result));
+                    print_status($step, status_fail, sprintf('Could not execute setup script, failed step: %s', $result));
                 }
                 $executedScripts[$script] = sha1_file($script);
             }
         } else {
-            $step = sprintf("Verifying checksum for %s", $script);
+            $step = sprintf('Verifying checksum for %s', $script);
             {
                 $fsChecksum = sha1_file($script);
                 if ($dbChecksum !== $fsChecksum) {
-                    print_status($step, status_fail, sprintf("Calculated checksum is different between database (%s) and filesystem (%s). Please correct manually!",
+                    print_status($step, status_fail, sprintf('Calculated checksum is different between database (%s) and filesystem (%s). Please correct manually!',
                         $dbChecksum, $fsChecksum));
                 }
             }
@@ -165,7 +165,7 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     }
 }
 
-$step = "Saving update information";
+$step = 'Saving update information';
 {
     $database->begin();
     foreach ($executedScripts as $script => $checksum) {
@@ -174,27 +174,27 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
                 'Checksum' => $checksum
             )) !== 1) {
             $database->rollBack();
-            print_status($step, status_fail, sprintf("Could not create update_info entry for %s", $script));
+            print_status($step, status_fail, sprintf('Could not create update_info entry for %s', $script));
         }
     }
     $database->commit();
     print_status($step, status_ok);
 }
 
-$step = "Verifying existing accounts";
+$step = 'Verifying existing accounts';
 {
     if (Database::getInstance()->getPlayerCount() === 0) {
-        print_status($step, status_needs_upgrade, "No accounts found");
-        $step = "Create new admin account";
+        print_status($step, status_needs_upgrade, 'No accounts found');
+        $step = 'Create new admin account';
         {
             Database::getInstance()->begin();
             $password = createRandomPassword();
             $id = Database::getInstance()->createUser('admin', 'admin@localhost', null, $password);
             if ($id === null) {
-                print_status($step, status_fail, "Could not create new user");
+                print_status($step, status_fail, 'Could not create new user');
             }
             if (Database::getInstance()->updateTableEntry(Database::TABLE_USERS, $id, array('Admin' => 1)) !== 1) {
-                print_status($step, status_fail, "Could not grant admin rights");
+                print_status($step, status_fail, 'Could not grant admin rights');
             }
 
             Database::getInstance()->commit();
@@ -205,21 +205,21 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     }
 }
 
-$step = "Checking for runtime configuration";
+$step = 'Checking for runtime configuration';
 {
     if (file_exists('../config/roundstart.ini')) {
-        print_status($step, status_needs_upgrade, "Found roundstart.ini");
-        $step = "Migrating roundstart.ini to database";
+        print_status($step, status_needs_upgrade, 'Found roundstart.ini');
+        $step = 'Migrating roundstart.ini to database';
         {
             $roundStartIni = parse_ini_file('../config/roundstart.ini');
             $database->begin();
             if ($database->createTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'roundstart', 'conf_value' => $roundStartIni['roundstart'])) === null) {
                 $database->rollBack();
-                print_status($step, status_fail, "Could not insert roundstart information");
+                print_status($step, status_fail, 'Could not insert roundstart information');
             }
             if (!unlink('../config/roundstart.ini')) {
                 $database->rollBack();
-                print_status($step, status_fail, "Could not delete obsolete config/roundstart.ini");
+                print_status($step, status_fail, 'Could not delete obsolete config/roundstart.ini');
             }
             $database->commit();
             print_status($step, status_ok);
@@ -229,20 +229,20 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     }
 }
 
-$step = "Verifying last cronjob run timestamp";
+$step = 'Verifying last cronjob run timestamp';
 {
     if ($database->existsTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'lastcron'))) {
         print_status($step, status_ok);
     } else {
-        print_status($step, status_needs_upgrade, "Entry not found");
-        $step = "Create lastcron entry";
+        print_status($step, status_needs_upgrade, 'Entry not found');
+        $step = 'Create lastcron entry';
         {
             $database->begin();
             $lastCron = time();
             $lastCron -= ($lastCron % (Config::getInt(Config::SECTION_BASE, 'cron_interval') * 60));
             if ($database->createTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'lastcron', 'conf_value' => $lastCron)) === null) {
                 $database->rollBack();
-                print_status($step, status_fail, "Could not insert lastcron information");
+                print_status($step, status_fail, 'Could not insert lastcron information');
             }
             $database->commit();
             print_status($step, status_ok);
@@ -250,20 +250,20 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     }
 }
 
-$step = "Verifying last points calculation timestamp";
+$step = 'Verifying last points calculation timestamp';
 {
     if ($database->existsTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'lastpoints'))) {
         print_status($step, status_ok);
     } else {
-        print_status($step, status_needs_upgrade, "Entry not found");
-        $step = "Create lastpoints entry";
+        print_status($step, status_needs_upgrade, 'Entry not found');
+        $step = 'Create lastpoints entry';
         {
             $database->begin();
             $lastCron = time();
             $lastCron -= ($lastCron % (Config::getInt(Config::SECTION_BASE, 'cron_interval') * 60));
             if ($database->createTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'lastpoints', 'conf_value' => $lastCron)) === null) {
                 $database->rollBack();
-                print_status($step, status_fail, "Could not insert lastpoints information");
+                print_status($step, status_fail, 'Could not insert lastpoints information');
             }
             $database->commit();
             print_status($step, status_ok);
@@ -271,18 +271,18 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
     }
 }
 
-$step = "Verifying currently active round";
+$step = 'Verifying currently active round';
 {
     if ($database->existsTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'roundstart'))) {
         print_status($step, status_ok);
     } else {
-        print_status($step, status_needs_upgrade, "No active round found");
-        $step = "Starting new round";
+        print_status($step, status_needs_upgrade, 'No active round found');
+        $step = 'Starting new round';
         {
             $database->begin();
             if ($database->createTableEntry(Database::TABLE_RUNTIME_CONFIG, array('conf_name' => 'roundstart', 'conf_value' => time())) === null) {
                 $database->rollBack();
-                print_status($step, status_fail, "Could not insert roundstart information");
+                print_status($step, status_fail, 'Could not insert roundstart information');
             }
             $database->commit();
             print_status($step, status_ok);
@@ -294,5 +294,5 @@ function print_status(string $step, int $status, ?string $extraInfo = null): voi
 http_response_code(200);
 echo "\n";
 echo "Update finished successfully!\n";
-echo "Execution took " . number_format($dauer, 2) . " ms\n";
+echo 'Execution took ' . number_format($dauer, 2) . " ms\n";
 echo Database::getInstance()->getQueryCount() . " queries were executed\n";
\ No newline at end of file
diff --git a/js/functions.js b/js/functions.js
index b52de91e..87693073 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -16,7 +16,7 @@ function BLMEnde() {
         opener.focus();
         self.close();
     } else {
-        document.location.href = "/actions/logout.php?popup=1";
+        document.location.href = '/actions/logout.php?popup=1';
     }
     return false;
 }
@@ -42,16 +42,16 @@ function ZeichenUebrig(Feld, Text) {
 function RechneProduktionsKosten(BasisMenge, BasisPreis, Menge, Geld, TextFeld, Button) {
     const kosten = Menge * (BasisPreis / BasisMenge);
 
-    TextFeld.innerText = "Kosten: " + kosten.toLocaleString(navigator.language, {
+    TextFeld.innerText = 'Kosten: ' + kosten.toLocaleString(navigator.language, {
         minimumFractionDigits: 2, maximumFractionDigits: 2
-    }) + " €";
+    }) + ' €';
 
     if (kosten > Geld || kosten < 0 || isNaN(kosten)) {
-        Button.enabled = "";
-        Button.disabled = "disabled";
+        Button.enabled = '';
+        Button.disabled = 'disabled';
     } else {
-        Button.disabled = "";
-        Button.enabled = "enabled";
+        Button.disabled = '';
+        Button.enabled = 'enabled';
     }
 }
 
@@ -79,16 +79,16 @@ function CountdownFields() {
             value = Date.parse('1970-01-01T' + hours + 'Z') + (1000 * 86400 * days);
         }
         if (value > 0 || direction > 0) {
-            field.innerText = "";
+            field.innerText = '';
             let date = new Date(value + direction * 1000);
             if (value > 86400000 && direction < 0) {
-                field.innerText += Math.floor(value / 86400000) + " Tage";
+                field.innerText += Math.floor(value / 86400000) + ' Tage';
             }
-            field.innerText += ' ' + date.toLocaleTimeString("de-DE", {
+            field.innerText += ' ' + date.toLocaleTimeString('de-DE', {
                 hour12: false,
-                hour: "2-digit",
-                minute: "2-digit",
-                second: "2-digit",
+                hour: '2-digit',
+                minute: '2-digit',
+                second: '2-digit',
                 timeZone: 'UTC'
             });
             if (field.innerText === '00:00:00' && reloadOnCountdown) {
@@ -150,7 +150,7 @@ function enableSitterOptions(enabled) {
 function chefboxPollJobs() {
     if (opener) {
         window.setInterval(() => {
-            let messages = opener.document.getElementsByClassName("MessageBox");
+            let messages = opener.document.getElementsByClassName('MessageBox');
             if (messages.length !== 0) {
                 let message = messages[0];
                 if (message.hasAttribute('reload-chefbox')) {
@@ -164,7 +164,7 @@ function chefboxPollJobs() {
 
 /* de-obfuscate fields with personal information */
 function deobfuscate() {
-    let fields = document.getElementsByClassName("bot");
+    let fields = document.getElementsByClassName('bot');
     for (let i = 0; i < fields.length; i++) {
         let botField = fields.item(i);
         let obf;
diff --git a/pages/admin_benutzer_bearbeiten.inc.php b/pages/admin_benutzer_bearbeiten.inc.php
index 9d02e835..4734b3ff 100644
--- a/pages/admin_benutzer_bearbeiten.inc.php
+++ b/pages/admin_benutzer_bearbeiten.inc.php
@@ -26,18 +26,18 @@
 // first form, general user data
 if (isset($_GET['username'])) $entry['Name'] = $_GET['username'];
 if (isset($_GET['email'])) $entry['EMail'] = $_GET['email'];
-if (isset($_GET['email_aktiviert'])) $entry['EMailAct'] = $_GET['email_aktiviert'] == "1" ? null : 'x';
+if (isset($_GET['email_aktiviert'])) $entry['EMailAct'] = $_GET['email_aktiviert'] == '1' ? null : 'x';
 if (isset($_GET['geld'])) $entry['Geld'] = getOrDefault($_GET, 'geld', .0);
 if (isset($_GET['bank'])) $entry['Bank'] = getOrDefault($_GET, 'bank', .0);
 if (isset($_GET['igm_gesendet'])) $entry['IgmGesendet'] = getOrDefault($_GET, 'igm_gesendet', 0);
 if (isset($_GET['igm_empfangen'])) $entry['IgmEmpfangen'] = getOrDefault($_GET, 'igm_empfangen', 0);
-if (isset($_GET['admin'])) $entry['Admin'] = $_GET['admin'] == "1" ? 1 : 0;
-if (isset($_GET['betatester'])) $entry['Betatester'] = $_GET['betatester'] == "1" ? 1 : 0;
+if (isset($_GET['admin'])) $entry['Admin'] = $_GET['admin'] == '1' ? 1 : 0;
+if (isset($_GET['betatester'])) $entry['Betatester'] = $_GET['betatester'] == '1' ? 1 : 0;
 if (isset($_GET['ewige_punkte'])) $entry['EwigePunkte'] = getOrDefault($_GET, 'ewige_punkte', 0);
 if (isset($_GET['onlinezeit'])) $entry['OnlineZeit'] = getOrDefault($_GET, 'onlinezeit', 0);
 if (isset($_GET['gruppe'])) $entry['Gruppe'] = $_GET['gruppe'];
 if (isset($_GET['verwarnungen'])) $entry['Verwarnungen'] = getOrDefault($_GET, 'verwarnungen', 0);
-if (isset($_GET['gesperrt'])) $entry['Gesperrt'] = $_GET['gesperrt'] == "1" ? 1 : 0;
+if (isset($_GET['gesperrt'])) $entry['Gesperrt'] = $_GET['gesperrt'] == '1' ? 1 : 0;
 
 // second form, building levels
 for ($i = 1; $i <= count_buildings; $i++) {
diff --git a/pages/bank.inc.php b/pages/bank.inc.php
index 09cf7547..118a1750 100644
--- a/pages/bank.inc.php
+++ b/pages/bank.inc.php
@@ -82,7 +82,7 @@ function AuswahlBank(option) {
         const maxWithdraw = Math.max(0, bank).toFixed(2);
         const currentValue = Number.parseFloat(field.value).toFixed(2);
         // only change value if the user didn't change it yet
-        if (currentValue === "0.00"
+        if (currentValue === '0.00'
             || currentValue === maxDeposit
             || currentValue === maxWithdraw
             || currentValue === hand.toFixed(2)
diff --git a/pages/buero.inc.php b/pages/buero.inc.php
index 625502e8..7a930ddb 100644
--- a/pages/buero.inc.php
+++ b/pages/buero.inc.php
@@ -36,7 +36,7 @@
         <?php
         for ($i = 1; $i <= count_wares; $i++) {
             if ($data['Forschung' . $i] == 0) continue;
-            $temp = "Forschung" . $i;
+            $temp = 'Forschung' . $i;
             $prodData = calculateProductionDataForPlayer($i, $data['Gebaeude' . building_plantage], $data['Forschung' . $i]);
             $sellPrice = calculateSellPrice($i, $data['Forschung' . $i], $data['Gebaeude' . building_shop], $data['Gebaeude' . building_school], $rates[$i]);
             $costPerKg = $prodData['Kosten'] / $prodData['Menge'];
diff --git a/pages/forschungszentrum.inc.php b/pages/forschungszentrum.inc.php
index e70ff4e8..e9bce3dd 100644
--- a/pages/forschungszentrum.inc.php
+++ b/pages/forschungszentrum.inc.php
@@ -10,7 +10,7 @@
 
 $data = Database::getInstance()->getPlayerMoneyAndResearchLevelsAndPlantageLevelAndResearchLabLevel($_SESSION['blm_user']);
 if ($data['Gebaeude' . building_research_lab] == 0) {
-    redirectTo('/?p=gebaeude', 145, "g2");
+    redirectTo('/?p=gebaeude', 145, 'g2');
 }
 
 $auftraege_db = Database::getInstance()->getAllAuftraegeByVonAndWasGreaterEqualsAndWasSmaller($_SESSION['blm_user'],
@@ -39,7 +39,7 @@
 
     $researchData = calculateResearchDataForPlayer($i, $data['Gebaeude' . building_research_lab], $data['Forschung' . $i]);
     $researchDataNext = calculateResearchDataForPlayer($i, $data['Gebaeude' . building_research_lab], $data['Forschung' . $i], 2);
-    $researchAttribute = "Forschung" . $i;
+    $researchAttribute = 'Forschung' . $i;
     ?>
     <div class="form Research">
         <header id="f<?= $i; ?>">
diff --git a/pages/gruppe_diplomatie.inc.php b/pages/gruppe_diplomatie.inc.php
index 8c06849f..ff1d1d58 100644
--- a/pages/gruppe_diplomatie.inc.php
+++ b/pages/gruppe_diplomatie.inc.php
@@ -100,6 +100,7 @@ function printDiplomacyTable($diplomacy, $name, $hasRights)
                 <td>
                     <?php
                     if ($rights['group_diplomacy'] == 1) {
+                        // FIXME CSP!
                         ?>
                         <a href="/actions/gruppe.php?a=17&amp;id=<?= $row['ID']; ?>&amp;token=<?= $_SESSION['blm_xsrf_token']; ?>"
                            onclick="return confirm('Wollen Sie in dem Krieg mit <?= escapeForOutput($row['GruppeName']); ?> wirklich kapitulieren? Der umkämpfte Betrag (<?= formatCurrency(2 * $row['Betrag']); ?>) geht an den Gegner, jeder Ihrer Gruppenmitglieder verliert <?= formatPercent(Config::getFloat(Config::SECTION_GROUP, 'war_loose_points')); ?> seiner Punkte und <?= Config::getInt(Config::SECTION_GROUP, 'war_loose_plantage'); ?> Stufe(n) seiner Plantagen!')">Aufgeben</a>
@@ -185,9 +186,9 @@ function printDiplomacyTable($diplomacy, $name, $hasRights)
                 <td><?= createGroupLink($row['VonId'], $row['VonName']); ?></td>
                 <td>
                     <a id="accept_<?= $row['ID']; ?>"
-                       href="/actions/gruppe.php?a=19&amp;id=<?= $row['ID']; ?>                    &amp;token=<?= $_SESSION['blm_xsrf_token']; ?>">Annehmen</a>
+                       href="/actions/gruppe.php?a=19&amp;id=<?= $row['ID']; ?>&amp;token=<?= $_SESSION['blm_xsrf_token']; ?>">Annehmen</a>
                     <a id="refuse_<?= $row['ID']; ?>"
-                       href="/actions/gruppe.php?a=20&amp;id=<?= $row['ID']; ?>                    &amp;token=<?= $_SESSION['blm_xsrf_token']; ?>">Ablehnen</a>
+                       href="/actions/gruppe.php?a=20&amp;id=<?= $row['ID']; ?>&amp;token=<?= $_SESSION['blm_xsrf_token']; ?>">Ablehnen</a>
                 </td>
             </tr>
             <?php
diff --git a/pages/impressum.inc.php b/pages/impressum.inc.php
index e4cae6af..2351a63a 100644
--- a/pages/impressum.inc.php
+++ b/pages/impressum.inc.php
@@ -19,8 +19,9 @@
     heruntergeladen werden.
 </p>
 <p>
-    Die Lizenz (MIT Licence) kann <a href="https://github.com/bratkartoffel/blm2/blob/master/LICENCE.md"
-                                     target="_blank">hier</a> eingesehen werden.
+    Die Lizenz (MIT Licence) kann
+    <a href="https://github.com/bratkartoffel/blm2/blob/master/LICENCE.md" target="_blank">hier</a>
+    eingesehen werden.
 </p>
 
 <h2>Betrieben wird diese Installation durch:</h2>
diff --git a/pages/mafia.inc.php b/pages/mafia.inc.php
index 85d11847..e2a1e590 100644
--- a/pages/mafia.inc.php
+++ b/pages/mafia.inc.php
@@ -58,7 +58,7 @@
     <tr>
         <td>Spionage</td>
         <td>Sammelt Informationen über den Gegner</td>
-        <td><?= (Config::getInt(Config::SECTION_MAFIA_ESPIONAGE, "wait_time") / 60); ?> Minuten</td>
+        <td><?= (Config::getInt(Config::SECTION_MAFIA_ESPIONAGE, 'wait_time') / 60); ?> Minuten</td>
     </tr>
     <tr>
         <td>Raub</td>
@@ -66,7 +66,7 @@
             zwischen <?= formatPercent(Config::getFloat(Config::SECTION_MAFIA_ROBBERY, 'min_rate')); ?>
             und <?= formatPercent(Config::getFloat(Config::SECTION_MAFIA_ROBBERY, 'max_rate')); ?> seines Bargeldes
         </td>
-        <td><?= (Config::getInt(Config::SECTION_MAFIA_ROBBERY, "wait_time") / 60); ?> Minuten</td>
+        <td><?= (Config::getInt(Config::SECTION_MAFIA_ROBBERY, 'wait_time') / 60); ?> Minuten</td>
     </tr>
     <tr>
         <td>Diebstahl</td>
@@ -75,12 +75,12 @@
             und <?= formatPercent(Config::getFloat(Config::SECTION_MAFIA_HEIST, 'max_rate')); ?>
             seiner Waren aus dem Lager
         </td>
-        <td><?= (Config::getInt(Config::SECTION_MAFIA_HEIST, "wait_time") / 60); ?> Minuten</td>
+        <td><?= (Config::getInt(Config::SECTION_MAFIA_HEIST, 'wait_time') / 60); ?> Minuten</td>
     </tr>
     <tr>
         <td>Anschlag</td>
         <td>Zerstört die Plantage des Gegners, senkt das Gebäudelevel um eine Stufe</td>
-        <td><?= (Config::getInt(Config::SECTION_MAFIA_ATTACK, "wait_time") / 60); ?> Minuten</td>
+        <td><?= (Config::getInt(Config::SECTION_MAFIA_ATTACK, 'wait_time') / 60); ?> Minuten</td>
     </tr>
 </table>
 
diff --git a/pages/marktplatz_liste.inc.php b/pages/marktplatz_liste.inc.php
index c9caddf7..4125374f 100644
--- a/pages/marktplatz_liste.inc.php
+++ b/pages/marktplatz_liste.inc.php
@@ -51,11 +51,11 @@
             <td>
                 <?php
                 if ($row['VonId'] != $_SESSION['blm_user']) {
-                    printf('<a class="buy_offer" data-id="%d"  href="./actions/marktplatz.php?a=2&amp;id=%s&amp;token=%s">Kaufen</a>',
+                    printf('<a class="buy_offer" data-id="%d" href="/actions/marktplatz.php?a=2&amp;id=%s&amp;token=%s">Kaufen</a>',
                         $rowNr, $row['ID'], $_SESSION['blm_xsrf_token']);
                 } else {
                     $refundWeight = formatWeight(floor($row['Menge'] * Config::getFloat(Config::SECTION_MARKET, 'retract_rate')), false);
-                    printf('<a class="retract_offer" data-id="%d" data-refund="%s" href="./actions/marktplatz.php?a=3&amp;id=%s&amp;token=%s">Zurückziehen</a>',
+                    printf('<a class="retract_offer" data-id="%d" data-refund="%s" href="/actions/marktplatz.php?a=3&amp;id=%s&amp;token=%s">Zurückziehen</a>',
                         $rowNr, $refundWeight, $row['ID'], $_SESSION['blm_xsrf_token']);
                 }
                 ?>
diff --git a/pages/nachrichten_schreiben.inc.php b/pages/nachrichten_schreiben.inc.php
index 7cf6577a..cb88d08b 100644
--- a/pages/nachrichten_schreiben.inc.php
+++ b/pages/nachrichten_schreiben.inc.php
@@ -19,7 +19,7 @@
 
     $receiver = $data['VonName'];
     $subject = stripos($data['Betreff'], 'Re:') === false ? 'Re: ' . $data['Betreff'] : $data['Betreff'];
-    $message = "\n\n[quote]" . $data['Nachricht'] . "[/quote]";
+    $message = "\n\n" . '[quote]' . $data['Nachricht'] . '[/quote]';
 }
 
 $receiver = getOrDefault($_GET, 'receiver', $receiver);
diff --git a/pages/vertraege_liste.inc.php b/pages/vertraege_liste.inc.php
index d0c8e1ee..dfa19398 100644
--- a/pages/vertraege_liste.inc.php
+++ b/pages/vertraege_liste.inc.php
@@ -42,6 +42,7 @@
             <td><?= formatCurrency($entry['Preis']); ?></td>
             <td><?= formatCurrency($entry['Preis'] * $entry['Menge']); ?></td>
             <td>
+                <!-- TODO confirm? -->
                 <a href="/actions/vertraege.php?a=2&amp;vid=<?= $entry['ID']; ?>&amp;token=<?= $_SESSION['blm_xsrf_token']; ?>">Annehmen</a>
                 |
                 <a href="/actions/vertraege.php?a=3&amp;vid=<?= $entry['ID']; ?>&amp;token=<?= $_SESSION['blm_xsrf_token']; ?>">Ablehnen</a>
diff --git a/pics/profile.php b/pics/profile.php
index e8a6e248..c2ef0019 100644
--- a/pics/profile.php
+++ b/pics/profile.php
@@ -12,26 +12,19 @@
 $gid = getOrDefault($_GET, 'gid', 0);
 
 if ($uid != 0) {
-    $prefix = "u";
+    $prefix = 'u';
     $id = $uid;
 } else if ($gid != 0) {
-    $prefix = "g";
+    $prefix = 'g';
     $id = $gid;
 } else {
     die('missing uid/gid parameter');
 }
 
-header("Cache-Control: max-age=86400, public");
-$suffixes = array('png' => 'image/png', 'jpg' => 'image/jpeg', 'gif' => 'image/gif', 'webp' => 'image/webp');
-foreach ($suffixes as $suffix => $mimetype) {
-    $filename = sprintf('uploads/%s_%d.%s', $prefix, $id, $suffix);
-    if (file_exists($filename)) {
-        header(sprintf("Content-Type: %s", $mimetype));
-        readfile($filename);
-        die();
-    }
+$filename = sprintf('uploads/%s_%d.webp', $prefix, $id);
+if (!file_exists($filename)) {
+    $filename = 'style/nopic.webp';
 }
 
-// no image found, show fallback image
-header("Content-Type: image/webp");
-readfile('style/nopic.webp');
+header('Content-Type: image/webp');
+readfile($filename);
diff --git a/tests/build.gradle b/tests/build.gradle
index c57a704e..f95f5664 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -41,13 +41,13 @@ test {
     // use junit 5
     useJUnitPlatform()
     // print status of tests
-    testLogging { events "passed", "skipped", "failed" }
-    if (project.hasProperty("webdriver.firefox.bin")) {
-        systemProperty "webdriver.firefox.bin", project.getProperty("webdriver.firefox.bin")
+    testLogging { events 'passed', 'skipped', 'failed' }
+    if (project.hasProperty('webdriver.firefox.bin')) {
+        systemProperty 'webdriver.firefox.bin', project.getProperty('webdriver.firefox.bin')
     }
 }
 
-tasks.named("dependencyUpdates").configure {
+tasks.named('dependencyUpdates').configure {
     gradleReleaseChannel = 'current'
     revision = 'integration'
 }