minor code cleanup

bratkartoffel · Jan 18, 2023 · 773e57e · 773e57e
1 parent a9f5ac9
commit 773e57e
Show file tree

Hide file tree

Showing 32 changed files with 65 additions and 65 deletions.
diff --git a/actions/activate.php b/actions/activate.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 

diff --git a/actions/admin_benutzer.php b/actions/admin_benutzer.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireAdmin();

diff --git a/actions/admin_markt.php b/actions/admin_markt.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireAdmin();

diff --git a/actions/admin_vertrag.php b/actions/admin_vertrag.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireAdmin();

diff --git a/actions/auftrag.php b/actions/auftrag.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/bank.php b/actions/bank.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/bioladen.php b/actions/bioladen.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/einstellungen.php b/actions/einstellungen.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/forschungszentrum.php b/actions/forschungszentrum.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/gebaeude.php b/actions/gebaeude.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/gruppe.php b/actions/gruppe.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/login.php b/actions/login.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 

diff --git a/actions/logout.php b/actions/logout.php
@@ -5,7 +5,7 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
+require_once __DIR__ . '/../include/functions.inc.php';
 
 ob_start();
 session_destroy();

diff --git a/actions/mafia.php b/actions/mafia.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/marktplatz.php b/actions/marktplatz.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/nachrichten.php b/actions/nachrichten.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/notizblock.php b/actions/notizblock.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/plantage.php b/actions/plantage.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/actions/pwd_reset.php b/actions/pwd_reset.php
@@ -5,9 +5,9 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
-require_once('../include/captcha.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
+require_once __DIR__ . '/../include/captcha.class.php';
 
 ob_start();
 

diff --git a/actions/registrieren.php b/actions/registrieren.php
@@ -5,9 +5,9 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
-require_once('../include/captcha.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
+require_once __DIR__ . '/../include/captcha.class.php';
 
 ob_start();
 

diff --git a/actions/vertraege.php b/actions/vertraege.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once('../include/functions.inc.php');
-require_once('../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 requireLogin();

diff --git a/chefbox.php b/chefbox.php
@@ -7,9 +7,9 @@
 */
 
 $start = microtime(true);
-require_once 'include/game_version.inc.php';
-require_once 'include/functions.inc.php';
-require_once 'include/database.class.php';
+require_once __DIR__ . '/include/game_version.inc.php';
+require_once __DIR__ . '/include/functions.inc.php';
+require_once __DIR__ . '/include/database.class.php';
 
 if (!isLoggedIn() || isRoundOver() || isGameLocked() || $_SESSION['blm_lastAction'] + Config::getInt(Config::SECTION_BASE, 'session_timeout') < time()) {
     session_destroy();

diff --git a/cronjobs/cron.php b/cronjobs/cron.php
@@ -7,8 +7,8 @@
  */
 error_reporting(E_ALL);
 const IS_CRON = true;
-require_once(dirname(__FILE__) . '/../include/functions.inc.php');
-require_once(dirname(__FILE__) . '/../include/database.class.php');
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 if (!IS_CRON) {
     die('cannot happen, just to please PhpStorm nagging about unused variable');

diff --git a/include/game_version.inc.php b/include/game_version.inc.php
@@ -8,7 +8,7 @@
 function getVersionExtra()
 {
     $version_extra = null;
-    $git_head = dirname(__FILE__) . '/../.git/HEAD';
+    $git_head = __DIR__ . '/../.git/HEAD';
     if (file_exists($git_head)) {
         $content = file_get_contents($git_head);
         if (strpos($content, 'ref:') !== false) {

diff --git a/index.php b/index.php
@@ -12,14 +12,14 @@
 ini_set('display_errors', 'false');
 ob_start();
 
-require_once('include/config.class.php');
+require_once __DIR__ . '/include/config.class.php';
 if (Config::getBoolean(Config::SECTION_BASE, 'testing')) {
     ini_set('display_errors', 'true');
 }
 
-require_once('include/functions.inc.php');
-require_once('include/game_version.inc.php');
-require_once('include/database.class.php');
+require_once __DIR__ . '/include/functions.inc.php';
+require_once __DIR__ . '/include/game_version.inc.php';
+require_once __DIR__ . '/include/database.class.php';
 
 verifyInstallation();
 

diff --git a/install/update.php b/install/update.php
@@ -10,15 +10,15 @@
 ob_start();
 http_response_code(500);
 
-require_once('../include/game_version.inc.php');
+require_once __DIR__ . '/../include/game_version.inc.php';
 echo "Checking installation for version " . game_version . "\n";
 echo "=========================================\n";
 if (!file_exists('../config/config.ini')) {
     die("> FAIL: config/config.ini not found");
 }
 
-require_once '../include/functions.inc.php';
-require_once '../include/database.class.php';
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 if (getOrDefault($_GET, 'secret', 'unset') !== Config::get(Config::SECTION_BASE, 'upgrade_secret')) {
     http_response_code(401);

diff --git a/pages/hilfe.inc.php b/pages/hilfe.inc.php
@@ -6,7 +6,7 @@
  * Please see LICENCE.md for complete licence text.
  */
 
-require_once('./include/hilfe.inc.php');
+require_once __DIR__ . '/hilfe.inc.php';
 ?>
 <div id="SeitenUeberschrift">
     <img src="/pics/big/khelpcenter.webp" alt=""/>

diff --git a/pages/passwort_vergessen.inc.php b/pages/passwort_vergessen.inc.php
@@ -8,7 +8,7 @@
 
 $email = getOrDefault($_GET, 'email');
 
-require_once('include/captcha.class.php');
+require_once __DIR__ . '/../include/captcha.class.php';
 $captcha = new Captcha();
 $captcha->createCaptcha();
 ?>

diff --git a/pages/registrieren.inc.php b/pages/registrieren.inc.php
@@ -13,7 +13,7 @@
 $name = getOrDefault($_GET, 'name');
 $email = getOrDefault($_GET, 'email');
 
-require_once('include/captcha.class.php');
+require_once __DIR__ . '/../include/captcha.class.php';
 $captcha = new Captcha();
 $captcha->createCaptcha();
 ?>

diff --git a/pics/profile.php b/pics/profile.php
@@ -6,7 +6,7 @@
  * Please see LICENCE.md for complete licence text.
  */
 
-require_once('../include/functions.inc.php');
+require_once __DIR__ . '/../include/functions.inc.php';
 
 $uid = getOrDefault($_GET, 'uid', 0);
 $gid = getOrDefault($_GET, 'gid', 0);

diff --git a/tests/src/test/resources/test-reset-player.php b/tests/src/test/resources/test-reset-player.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once '../include/functions.inc.php';
-require_once '../include/database.class.php';
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
 $id = getOrDefault($_GET, 'id', 0);

diff --git a/tests/src/test/resources/test-run-cron.php b/tests/src/test/resources/test-run-cron.php
@@ -5,8 +5,8 @@
  *
  * Please see LICENCE.md for complete licence text.
  */
-require_once '../include/functions.inc.php';
-require_once '../include/database.class.php';
+require_once __DIR__ . '/../include/functions.inc.php';
+require_once __DIR__ . '/../include/database.class.php';
 
 ob_start();
-include '../cronjobs/cron.php';
+include __DIR__ . '/../cronjobs/cron.php';