Merge pull request #162 from Deutscher-Tischfussballbund/sportsmanager2-stage

stage 2 prod pr

.github/workflows/build_release.yml

@@ -25,6 +25,20 @@ jobs:
       - name: Install npm dependencies
         run: npm ci
 
+      - name: Get version from git tag
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Update version.php
+        run: |
+          echo "<?php" > src/structure/components/com_sportsmanager/util/version.php
+          echo "defined('_JEXEC') or die;" >> src/structure/components/com_sportsmanager/util/version.php
+          echo "return [" >> src/structure/components/com_sportsmanager/util/version.php
+          echo "    'version' => '${{ env.VERSION }}'," >> src/structure/components/com_sportsmanager/util/version.php
+          echo "    'date' => '$(date +%F)'," >> src/structure/components/com_sportsmanager/util/version.php
+          echo "];" >> src/structure/components/com_sportsmanager/util/version.php
+          echo "Updating version to $VERSION in sportsmanager.xml"
+          sed -i "s#<version>.*</version>#<version>$VERSION</version>#" src/structure/sportsmanager.xml
+
       - name: Generate release notes
         id: release_notes_extension
         uses: release-drafter/release-drafter@v6

README.md

@@ -83,3 +83,25 @@ JConfig: `./data/joomla_data/configuration.php`
 7. Click on "Start Listening for PHP Debug Connections" in the top row of intellij
 8. (Not sure if optional) Install a browser extension by Jetbrains  
 https://chromewebstore.google.com/detail/xdebug-helper-by-jetbrain/aoelhdemabeimdhedkidlnbkfhnhgnhm
+
+
+### How to release
+Hint: for technical details regarding the release process have a look into .github/...  
+To create a release these steps need to be followed
+1. make sure all needed code changes are merged from dev -> stage -> prod, since releases may only be build on prod branch
+2. give pull requests meaningful names and label them enhancement/bug/chore since labels and names are used for release note generation
+    Hint: if a specific pull request should be ignored, add the label changelog-ignore
+3. tag a commit (recommended is the latest merge on prod). The pipeline is listening for any tag fitting `v[0-9]+.[0-9]+.[0-9]+`
+    ```shell
+      git tag -a v1.2.3 1a2b3c4 -m "Release version 1.2.3"
+    ```
+4. push the tag 
+    ```shell
+      git push origin --tags
+    ```
+5. the tag push will trigger the pipeline, and it will create the release and store in GitHub
+
+A release can be created again anytime by deleting the release from GitHub, deleting the tag (from GitHub and additionally from git)
+and repeating step 3 and 4
+
+Further: merges from dev to stage and from stage to prod can only be done by creating pull requests. These pull requests will be automatically labeled as changelog-ignore

src/structure/components/com_sportsmanager/api.php

@@ -4,10 +4,8 @@
  */
 
 use JetBrains\PhpStorm\NoReturn;
-use Joomla\CMS\Application\AdministratorApplication;
 use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\User\UserFactory;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Registry\Registry;
 
@@ -43,8 +41,7 @@ function notifyChange($data): void
     try {
         $db = getDatabase();
         $query = "SELECT wert from #__sportsmanager_einstellungen WHERE name='api_push_key'";
-        $db->setQuery($query);
+        $push_key = loadResult($db, $query);
-        $push_key = $db->loadResult();
         $push_server = !empty($push_key) && isset(_payload($push_key)->aud) ? _payload($push_key)->aud : '';
         if ($push_server != '' && $push_key != '') {
             $url = $push_server . (str_ends_with($push_server, '/') ? '' : '/') . 'v1/notifications/send';
@@ -137,11 +134,8 @@ function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $h
         $expires->modify('+16 hours');
         $db = getDatabase();
         $query = "SELECT berechtigt_team_id from #__sportsmanager_berechtigt_fuer_team where berechtigt_user_id = $user_id";
-        $db->setQuery($query);
+        $team_id = loadObjectList($db, $query);
-        if (!$db->execute()) {
+
-            abortWithError($db->stderr(true));
-        }
-        $team_id = $db->loadObjectList();
         JSON_sportsmanager::JSON([
             'token' => jwt_token([
                 'sub' => $user_id,
@@ -180,8 +174,7 @@ function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $h
     $db = getDatabase();
     $query = $db->getQuery(true);
     $query->select('id')->from('#__users')->where('username = "' . $username . '"')->setLimit(1);
-    $db->setQuery($query);
+    $user_id = loadResult($db, $query);
-    $user_id = $db->loadResult();
     $user = $container->get(UserFactoryInterface::class)->loadUserById($user_id);
 
     //TODO: pw verification modernising: use php native methods, however this also needs new pw hashing. maybe force a pw reset on all accounts

src/structure/components/com_sportsmanager/database/init.php

@@ -7,6 +7,8 @@ use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Mysql\MysqlDriver;
 use Joomla\Database\Mysqli\MysqliDriver;
 
+require_once JPATH_SITE . '/components/com_sportsmanager/database/util.php';
+
 function initDatabase(): void
 {
     global $sportsmanager_database_local;
@@ -22,11 +24,7 @@ function initDatabase(): void
     $sportsmanager_database_local = Factory::getContainer()->get(DatabaseInterface::class);
 
     $query = "SELECT * FROM #__sportsmanager_einstellungen";
-    $sportsmanager_database_local->setQuery($query);
+    $rows = loadObjectList($sportsmanager_database_local, $query);
-    if (!$sportsmanager_database_local->execute()) {
-        die($sportsmanager_database_local->stderr(true));
-    }
-    $rows = $sportsmanager_database_local->loadObjectList();
 
     $database_driver = "mysql";
     $database_host = "";
@@ -75,14 +73,13 @@ function initDatabase(): void
         if ($sportsmanager_database_external === NULL) {
             echo "<strong>" . Text::_('COM_SPORTSMANAGER_CONNECTION_EXTERNAL_DB_FAILURE') . "</strong><br><br>";
         } else {
-            $query = "SELECT wert FROM #__sportsmanager_einstellungen WHERE name = 'datenbank_version'";
-            $sportsmanager_database_external->setQuery($query);
             try {
                 if (!$sportsmanager_database_external->execute()) {
                     echo "<strong>" . Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_NO_SM_TABLES') . "</strong><br><br>";
                     $sportsmanager_database_external = NULL;
                 } else {
-                    $db_version = $sportsmanager_database_external->loadResult();
+                    $query = "SELECT wert FROM #__sportsmanager_einstellungen WHERE name = 'datenbank_version'";
+                    $db_version = loadResult($sportsmanager_database_external, $query);
                     if ($db_version < 38) {
                         echo "<strong>" . Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_NO_SM_VERSION') . "</strong><br><br>";
                         $sportsmanager_database_external = NULL;

src/structure/components/com_sportsmanager/database/update.php

@@ -20,27 +20,15 @@ function updateDatabase(): void
     $termin_aktionen_email_setzen = false;
 
     $query = "SHOW TABLE STATUS WHERE name = '" . $db->getPrefix() . "tsleague_basis' || name = '" . $db->getPrefix() . "tsleague_einstellungen'";
-    $db->setQuery($query);
+    $rows = loadObjectList($db, $query);
-    if (!$db->execute()) {
-        die($db->stderr(true));
-    }
-    $rows = $db->loadObjectList();
 
     if (count($rows) > 0) {
         $query = "SHOW TABLE STATUS WHERE name = '" . $db->getPrefix() . "tsleague_basis'";
-        $db->setQuery($query);
+        $rows = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $rows = $db->loadObjectList();
 
         if (count($rows) > 0) {
             $query = "SELECT * FROM #__tsleague_basis";
-            $db->setQuery($query);
+            $rows = loadObjectList($db, $query);
-            if (!$db->execute()) {
-                die($db->stderr(true));
-            }
-            $rows = $db->loadObjectList();
             if (count($rows) == 0)
                 die(Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_INCONSISTENCY'));
 
@@ -337,11 +325,7 @@ function updateDatabase(): void
             if ($datenbank_version < 9) {
                 $query = "SELECT spieler_id, geschlecht"
                     . "\n FROM #__tsleague_spieler";
-                $db->setQuery($query);
+                $spieler = loadObjectList($db, $query);
-                if (!$db->execute()) {
-                    die($db->stderr(true));
-                }
-                $spieler = $db->loadObjectList();
 
                 $query = "ALTER TABLE #__tsleague_spieler CHANGE geschlecht geschlecht char(1)";
                 $db->setQuery($query);
@@ -855,11 +839,7 @@ function updateDatabase(): void
         }
 
         $query = "SELECT * FROM #__tsleague_einstellungen WHERE name = 'datenbank_version'";
-        $db->setQuery($query);
+        $rows = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $rows = $db->loadObjectList();
         if (count($rows) == 0)
             die(Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_INCONSISTENCY'));
 
@@ -1728,11 +1708,7 @@ function updateDatabase(): void
     }
 
     $query = "SELECT * FROM #__sportsmanager_einstellungen WHERE name = 'datenbank_version'";
-    $db->setQuery($query);
+    $rows = loadObjectList($db, $query);
-    if (!$db->execute()) {
-        die($db->stderr(true));
-    }
-    $rows = $db->loadObjectList();
     if (count($rows) == 0)
         die(Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_INCONSISTENCY'));
 
@@ -2174,11 +2150,7 @@ function updateDatabase(): void
             . "\n SELECT YEAR(erster_tag) AS jahr FROM #__sportsmanager_bestenliste WHERE NOT ISNULL(erster_tag)"
             . "\n GROUP BY jahr"
             . "\n ORDER BY jahr";
-        $db->setQuery($query);
+        $jahre = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $jahre = $db->loadObjectList();
 
         if (count($jahre) > 0) {
             foreach ($jahre as $jahr) {
@@ -2199,11 +2171,7 @@ function updateDatabase(): void
         }
 
         $query = "SELECT * FROM #__sportsmanager_saison ORDER BY saisonbezeichnung DESC LIMIT 1";
-        $db->setQuery($query);
+        $saisons = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $saisons = $db->loadObjectList();
 
         $aktuelle_saison_id = $saisons[0]->saison_id;
 // Saisons den Veranstaltungen zuordnen
@@ -2644,11 +2612,7 @@ function updateDatabase(): void
             . "\n INNER JOIN #__sportsmanager_veranstaltung USING (veranstaltung_id)"
             . "\n LEFT JOIN #__sportsmanager_saison USING (saison_id)"
             . "\n ORDER BY heimspielort_name, heimspielort_anschrift";
-        $db->setQuery($query);
+        $teams = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $teams = $db->loadObjectList();
 
         $heimspielort_name = "";
         $heimspielort_strasse = "";
@@ -3020,11 +2984,7 @@ function updateDatabase(): void
 
         $query = "SELECT * FROM #__sportsmanager_turniervoranmeldung"
             . "\n ORDER BY turnierdisziplin_id";
-        $db->setQuery($query);
+        $rows = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $rows = $db->loadObjectList();
 
         foreach ($rows as $row) {
             $query = "INSERT INTO #__sportsmanager_turniermeldung (turnierdisziplin_id, rundenstufe, platz)"
@@ -3215,11 +3175,7 @@ function updateDatabase(): void
 
     if ($datenbank_version < 40) {
         $query = "SELECT * FROM #__sportsmanager_kategorie ORDER BY typ, nummer, kategorie_id DESC";
-        $db->setQuery($query);
+        $rows = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $rows = $db->loadObjectList();
 
         $typ = -1;
         $nummer = -1;
@@ -4053,11 +4009,7 @@ function updateDatabase(): void
         }
 
         $query = "SELECT * FROM #__sportsmanager_moderator";
-        $db->setQuery($query);
+        $rows = loadObjectList($db, $query);
-        if (!$db->execute()) {
-            die($db->stderr(true));
-        }
-        $rows = $db->loadObjectList();
 
         foreach ($rows as $row) {
             $moderator_id = $row->moderator_id;
@@ -5214,8 +5166,7 @@ function updateDatabase(): void
             ->from('INFORMATION_SCHEMA.COLUMNS')
             ->where('TABLE_NAME = ' . $db->quote($db->replacePrefix('#__sportsmanager_rangliste')))
             ->where('COLUMN_NAME = ' . $db->quote('lizenzen'));
-        $db->setQuery($query);
+        $exists = (bool)loadResult($db, $query);
-        $exists = (bool)$db->loadResult();
 
         if (!$exists) {
             $query = "ALTER TABLE #__sportsmanager_rangliste ADD lizenzen varchar(30) DEFAULT NULL AFTER streichergebnisse";
@@ -5230,8 +5181,7 @@ function updateDatabase(): void
             ->from('INFORMATION_SCHEMA.COLUMNS')
             ->where('TABLE_NAME = ' . $db->quote($db->replacePrefix('#__sportsmanager_spieler')))
             ->where('COLUMN_NAME = ' . $db->quote('lizenz'));
-        $db->setQuery($query);
+        $exists = (bool)loadResult($db, $query);
-        $exists = (bool)$db->loadResult();
 
         if (!$exists) {
             $query = "ALTER TABLE #__sportsmanager_spieler ADD lizenz varchar(30) DEFAULT NULL AFTER lizenznr";
@@ -5266,14 +5216,85 @@ function updateDatabase(): void
         }
     }
 
-    if ($termin_aktionen_email_setzen) {
+    if ($datenbank_version < 104) {
-        $query = "SELECT aktion_user_id, termin_aktion_id"
+
-            . "\n FROM #__sportsmanager_termin_aktion";
+		$query = "ALTER TABLE #__sportsmanager_veranstaltung ADD direktervergleich INT(4) NOT NULL DEFAULT '0' AFTER tabellenwertung;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+        }
+
+		$query = "ALTER TABLE #__sportsmanager_team ADD setzliste_nr INT(4) NULL DEFAULT NULL AFTER veranstaltung_id;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+		}
+
+		$query = "ALTER TABLE #__sportsmanager_begegnung ADD spiel_nr INT(4) NULL DEFAULT NULL AFTER spieltag;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+		}
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '104'"
+            . "\n WHERE name = 'datenbank_version'";
         $db->setQuery($query);
         if (!$db->execute()) {
             die($db->stderr(true));
         }
-        $rows = $db->loadObjectList();
+    }
+
+    if ($datenbank_version < 105) {
+
+		$query = "ALTER TABLE `#__sportsmanager_begegnung` ADD `spieltag_titel` VARCHAR(32) NOT NULL DEFAULT '' AFTER `spieltag`;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+        }
+
+		$query = "ALTER TABLE `#__sportsmanager_veranstaltung` ADD `spieltag_titel_zeigen` INT(4) NOT NULL DEFAULT '0' AFTER `unterteilung`;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+		}
+
+		$query = "ALTER TABLE `#__sportsmanager_team` ADD `teamname_kurz` VARCHAR(24) NOT NULL DEFAULT '' AFTER `teamname`;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+		}
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '105'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+
+    if ($datenbank_version < 106) {
+
+		$query = "ALTER TABLE `#__sportsmanager_verein` ADD `verstecken` INT(4) NOT NULL DEFAULT '0' AFTER `ausgetreten`;";
+		$db->setQuery($query);
+		if (!$db->execute()) {
+			die($db->stderr(true));
+        }
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '106'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+
+    if ($termin_aktionen_email_setzen) {
+        $query = "SELECT aktion_user_id, termin_aktion_id"
+            . "\n FROM #__sportsmanager_termin_aktion";
+        $rows = loadObjectList($db, $query);
 
         foreach ($rows as $row) {
             $container = Factory::getContainer();

src/structure/components/com_sportsmanager/database/util.php

@@ -0,0 +1,47 @@
+<?php
+
+use Joomla\CMS\Log\Log;
+
+/**
+ * @param $db
+ * @param $query
+ * @return mixed
+ * @since 2.0.5
+ */
+function loadObjectList($db, $query): mixed
+{
+    try {
+        $db->setQuery($query);
+        $objList = $db->loadObjectList();
+    } catch (RuntimeException $e) {
+        Log::add("Database error: " . $e->getMessage(), Log::ERROR, "com_sportsmanager");
+        if(isJson()) {
+            abortWithError($e->getMessage());
+        } else {
+            throw $e;
+        }
+    }
+    return $objList;
+}
+
+/**
+ * @param $db
+ * @param $query
+ * @return mixed
+ * @since 2.0.5
+ */
+function loadResult($db, $query): mixed
+{
+    try {
+        $db->setQuery($query);
+        $result = $db->loadResult();
+    } catch (RuntimeException $e) {
+        Log::add("Database error: " . $e->getMessage(), Log::ERROR, "com_sportsmanager");
+        if(isJson()) {
+            abortWithError($e->getMessage());
+        } else {
+            throw $e;
+        }
+    }
+    return $result;
+}

src/structure/components/com_sportsmanager/tools.php

@@ -10,7 +10,6 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\User;
 use Joomla\CMS\Version;
 
 defined('_JEXEC') or die('Restricted access');

src/structure/components/com_sportsmanager/util/image.php

@@ -7,6 +7,8 @@ use Joomla\CMS\Uri\Uri;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 
+require_once JPATH_SITE . '/components/com_sportsmanager/database/util.php';
+
 const SPORTSMANAGER_JOOMLA_PATH = JPATH_ROOT;
 define("SPORTSMANAGER_JOOMLA_URL", Uri::base());
 
@@ -241,11 +243,7 @@ function playerImage($playerId, $gender, $width = 180, $height = 240): ?string
         . "\n FROM #__sportsmanager_spieler"
         . "\n WHERE NOT ISNULL(aktueller_verein_id) AND NOT bild_ausblenden" . (!empty($spielernr) ? " AND spielernr = '$spielernr'" : " AND lizenznr = '$lizenznr'")
         . "\n ORDER BY spieler_id DESC";
-    $db->setQuery($query);
+    $rows = loadObjectList($db, $query);
-    if (!$db->execute()) {
-        die($db->stderr(true));
-    }
-    $rows = $db->loadObjectList();
     if (count($rows) < 1) {
         ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
         header('HTTP/1.1 404 Not Found');
@@ -358,7 +356,7 @@ function bildURL($typ, $id, $fixed_width = 0, $fixed_height = 0, $max_width = 0,
 #crop=250,250,left
 #crop=250,250,right
  */
-function yoothemeBild($typ, $id, $alternativ, $resize = '', $zusatz = ""): ?string
+function yoothemeBild($typ, $id, $alternativ, $zusatz = ""): ?string
 {
     $typ_exploded = explode("/", $typ);
     $typ          = $typ_exploded[0];
@@ -384,7 +382,7 @@ function yoothemeBild($typ, $id, $alternativ, $resize = '', $zusatz = ""): ?stri
 
     $bildpfad =  SPORTSMANAGER_JOOMLA_URL . "images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . "." . $ext;
 
-    return '<img  class="el-image" data-src="' . $bildpfad . $resize . '" ' . $zusatz . ' uk-img />';
+    return '<img  class="el-image" data-src="' . $bildpfad . '" ' . $zusatz . ' uk-img />';
 }
 
 function bildHTML($typ, $id, $fixed_width = 0, $fixed_height = 0, $max_width = 0, $max_height = 0, $zusatz = "", $alternativ = ""): ?string

src/structure/components/com_sportsmanager/util/version.php

@@ -0,0 +1,6 @@
+<?php // do not change this file, this is automatically updated while building releases, see .github/workflows/build_release.yml
+defined('_JEXEC') or die;
+return [
+    'version' => 'DEV',
+    'date' => '2025-08-05',
+];

src/structure/language/de-DE/de-DE.com_sportsmanager.ini

@@ -21,6 +21,7 @@ COM_SPORTSMANAGER_LOCATIONS="Spielorte"
 COM_SPORTSMANAGER_SEASONS="Saisons"
 COM_SPORTSMANAGER_TEAM_PLANS="Mannschaftsspielpläne"
 COM_SPORTSMANAGER_TEAM_NAME="Mannschaftsname"
+COM_SPORTSMANAGER_TEAM_NAME_SHORT="Mannschaftsname kurz (max 24)"
 COM_SPORTSMANAGER_TEAM_NAME2="Vereinsname"
 COM_SPORTSMANAGER_TEAM_SEAT="Vereinssitz"
 COM_SPORTSMANAGER_POSTPONE_RULES="Verschieberegeln"
@@ -130,10 +131,13 @@ COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT="1/4"
 COM_SPORTSMANAGER_ROUND_OF_16="Achtelfinale"
 COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT="1/8"
 COM_SPORTSMANAGER_ROUND_OF_32="Sechzehntelfinale"
+COM_SPORTSMANAGER_ROUND_OF_32_ALT="16-tel-Finale"
 COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT="1/16"
 COM_SPORTSMANAGER_ROUND_OF_64="Zweiunddreißigstelfinale"
+COM_SPORTSMANAGER_ROUND_OF_64_ALT="32-tel-Finale"
 COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT="1/32"
 COM_SPORTSMANAGER_ROUND_OF_128="Vierundsechzigstelfinale"
+COM_SPORTSMANAGER_ROUND_OF_128_ALT="64-tel-Finale"
 COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT="1/64"
 COM_SPORTSMANAGER_DAY_0_SHORTCUT="So."
 COM_SPORTSMANAGER_DAY_1_SHORTCUT="Mo."
@@ -311,6 +315,9 @@ COM_SPORTSMANAGER_FOR_OTHER_CONTACT="Für andere Ansprechpartner"
 COM_SPORTSMANAGER_DATES_REGISTERED_USERS="Termine beantragten durch angemeldete Benutzer"
 COM_SPORTSMANAGER_VIEW_ELO_RATING="Elo-Wertung anzeigen"
 COM_SPORTSMANAGER_VIEW_SPORTSMANAGER_LIZENZ="Lizenz anzeigen"
+COM_SPORTSMANAGER_VIEW_LEAST_MEMBER_COUNT="Mindest Mitgliederzahl zeigen"
+COM_SPORTSMANAGER_SHOW_ORGANISATION="Verband zeigen"
+COM_SPORTSMANAGER_SHOW_TOURNAMENT_BRACKET="Turnierbaum anzeigen"
 COM_SPORTSMANAGER_PLAYER_DETAILS="Spielerdetails"
 COM_SPORTSMANAGER_PLAYER_LIST_DETAILS="Spielerliste/-details"
 COM_SPORTSMANAGER_PLAYER_EDIT="Spielerdaten durch Organisations-/Vereinsansprechpartner bearbeiten"
@@ -380,6 +387,7 @@ COM_SPORTSMANAGER_MEMBER_STATUS="Mitgliedsstatus"
 COM_SPORTSMANAGER_ACTIVE="Aktiv"
 COM_SPORTSMANAGER_RESTRICTED="Eingeschränkt"
 COM_SPORTSMANAGER_BEATEN="Ausgetreten"
+COM_SPORTSMANAGER_HIDE="Verstecken"
 COM_SPORTSMANAGER_PASSIVE="Passiv"
 COM_SPORTSMANAGER_BEATEN_CLUB="Verein ausgetreten"
 COM_SPORTSMANAGER_SINGLE_SEED="Elo-Startwert Einzel"
@@ -404,8 +412,9 @@ COM_SPORTSMANAGER_COUNTRY_CODE="Landeskennung"
 COM_SPORTSMANAGER_IMPORT="Importieren"
 COM_SPORTSMANAGER_IMPORT_MESSAGE="Im Import sind ausschließlich Spielerdaten zum Verein %s enthalten. Soll ausschließlich der Spielerbestand des einen Vereins aktualisiert werden, muss der zugehörige Verein unten ausgewählt werden. Beinhaltet der Import den gesamten Spielerbestand einer Organisation, muss die zugehörige Organisation gewählt werden."
 COM_SPORTSMANAGER_CHECK="Prüfen"
-COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="Im Import sind Konflikte enthalten, die im Vorfeld manuell beseitigt werden müssen."
+COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="Im Import sind Fehler oder Konflikte enthalten, die im Vorfeld manuell beseitigt werden müssen."
 COM_SPORTSMANAGER_IMPORT_DUPLICATE_MESSAGE="Versuch, Spielernr. auf eine bereits für einen anderen Spieler vergebene Spielernr. zu ändern"
+COM_SPORTSMANAGER_IMPORT_WRONG_FORMAT_PLAYERNUMBER="Eine oder mehrere Spielernummer enthalten ein ungültiges Format"
 COM_SPORTSMANAGER_NAME2="Name"
 COM_SPORTSMANAGER_DATA_IMPORT_ABORT_MESSAGE="Der Import wird abgebrochen, da Konflikte bei den zu importierenden Spielerdaten bestehen. Bitte kontaktiere einen Moderator und sende dabei die Importdatei mit!"
 COM_SPORTSMANAGER_DATA_IMPORT_NO_CONFLICTS="Es bestehen keine Konflikte bei den zu importierenden Spielerdaten."
@@ -536,6 +545,7 @@ COM_SPORTSMANAGER_FULL_RATING="Volle Wertung"
 COM_SPORTSMANAGER_NO_RATING="Keine Wertung"
 COM_SPORTSMANAGER_TEAM_COMPETITIONS="Mannschaftswettbewerbe"
 COM_SPORTSMANAGER_TABLE_SUMMARY="Tabellenwertung"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_RECORD="Direkter Vergleich"
 COM_SPORTSMANAGER_POINTS_WON_LOST_DIFFERENCE="Spielpunkte gewonnen, Spielpunkte verloren, Punktedifferenz"
 COM_SPORTSMANAGER_PERFORMANCE_INDEX="Leistungsindex (SP+ * SP+ * 100) / (SP+ + SP-), Spielpunkte gewonnen, ..."
 COM_SPORTSMANAGER_PERFORMANCE_INDEX2="Leistungsindex (S * P+ * 10) / (P+ + P-), Spielpunkte gewonnen, ..."
@@ -604,7 +614,10 @@ COM_SPORTSMANAGER_ONLY_DETAILED_RATING_POINT_DIFFERENCE="Nur Detailwertung nach
 COM_SPORTSMANAGER_ONLY_DETAILED_POINTS_AFTER_POINTSRATE="Nur Detailwertung nach Punktequote"
 COM_SPORTSMANAGER_KO_SIMPLE_FULL="K.O. (einfach oder vollstaendige Ausspielung aller Plaetze)"
 COM_SPORTSMANAGER_MANUAL_PRO_TEAMS="Manuell (pro Mannschaft)"
+COM_SPORTSMANAGER_CUP_DRAW_EVERY_ROUND="Pokal: Jede Runde wird neu gelost"
+COM_SPORTSMANAGER_CUP_USING_SEEDING_LIST="Pokal: Losen einer Setzliste"
 COM_SPORTSMANAGER_SUBDIVISION="Unterteilung"
+COM_SPORTSMANAGER_SHOW_MATCHDAY_TITLE="Titel von Spieltag zeigen"
 COM_SPORTSMANAGER_ELO_RATING="ELO-Wertung"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_EVENT="Berechtigte für Veranstaltung"
 COM_SPORTSMANAGER_TITLE_LOGO="Titel-Logo"
@@ -632,6 +645,8 @@ COM_SPORTSMANAGER_GAMEDAY="Spieltag"
 COM_SPORTSMANAGER_GAMEDAYS="Spieltage"
 COM_SPORTSMANAGER_ROUND="Runde"
 COM_SPORTSMANAGER_ROUNDS="Runden"
+COM_SPORTSMANAGER_ROUND_TITLE="Runde Bezeichnung"
+COM_SPORTSMANAGER_MATCH_PLACE3="Spiel um Platz 3"
 COM_SPORTSMANAGER_MONTH="Monat"
 COM_SPORTSMANAGER_MONTHS="Monate"
 COM_SPORTSMANAGER_PLAYER_FROM_TEAM="Spieler von Mannschaft"
@@ -647,7 +662,9 @@ COM_SPORTSMANAGER_SO_FAR="bisher"
 COM_SPORTSMANAGER_PLACEMENT_AREA="Platzierungsbereich"
 COM_SPORTSMANAGER_IMAGE_WITHIN_TEAM="Bild innerhalb Mannschaft"
 COM_SPORTSMANAGER_ADD_MEETING="Begegnung hinzufügen"
+COM_SPORTSMANAGER_GAMEDAY_GENERATION="Spieltag erzeugen"
 COM_SPORTSMANAGER_ROUND_GENERATION="Runde erzeugen"
+COM_SPORTSMANAGER_CUP_ROUND_GENERATION="Pokalrunde auslosen"
 COM_SPORTSMANAGER_GENERATE_GROUP_GAME="Gruppenspiele erzeugen"
 COM_SPORTSMANAGER_IMPORT_GROUP_GAME="Gruppenspiele importieren"
 COM_SPORTSMANAGER_IMPORT_GROUP_GAME2="Gruppenspiele: Importieren"
@@ -775,6 +792,7 @@ COM_SPORTSMANAGER_FEDERAL_STATES="Bundesländer"
 COM_SPORTSMANAGER_STATES="Länder"
 COM_SPORTSMANAGER_YEAR="Jahr"
 COM_SPORTSMANAGER_ADDITION="Zusatz"
+COM_SPORTSMANAGER_LOCATION="Ort"
 COM_SPORTSMANAGER_STATE="Land"
 COM_SPORTSMANAGER_FEDERAL_="Bundes-"
 COM_SPORTSMANAGER_INFO="Info"

src/structure/language/en-GB/en-GB.com_sportsmanager.ini

@@ -21,6 +21,7 @@ COM_SPORTSMANAGER_LOCATIONS="Locations"
 COM_SPORTSMANAGER_SEASONS="Seasons"
 COM_SPORTSMANAGER_TEAM_PLANS="Team plans"
 COM_SPORTSMANAGER_TEAM_NAME="Team name"
+COM_SPORTSMANAGER_TEAM_NAME_SHORT="Team name short (max 24)"
 COM_SPORTSMANAGER_TEAM_NAME2="Club name"
 COM_SPORTSMANAGER_TEAM_SEAT="Club location"
 COM_SPORTSMANAGER_POSTPONE_RULES="Postpone rules"
@@ -129,11 +130,14 @@ COM_SPORTSMANAGER_QUARTER_FINAL="Quarter final"
 COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT="1/4"
 COM_SPORTSMANAGER_ROUND_OF_16="Round of sixteen"
 COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT="1/8"
-COM_SPORTSMANAGER_ROUND_OF_32="Round of thiry-two"
+COM_SPORTSMANAGER_ROUND_OF_32="Round of thirty-two"
+COM_SPORTSMANAGER_ROUND_OF_32_ALT="Round of thirty-two"
 COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT="1/16"
 COM_SPORTSMANAGER_ROUND_OF_64="Round of sixty-four"
+COM_SPORTSMANAGER_ROUND_OF_64_ALT="Round of sixty-four"
 COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT="1/32"
 COM_SPORTSMANAGER_ROUND_OF_128="Round of 128"
+COM_SPORTSMANAGER_ROUND_OF_128_ALT="Round of 128"
 COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT="1/64"
 COM_SPORTSMANAGER_DAY_0_SHORTCUT="Su."
 COM_SPORTSMANAGER_DAY_1_SHORTCUT="Mo."
@@ -311,6 +315,9 @@ COM_SPORTSMANAGER_FOR_OTHER_CONTACT="For other contact"
 COM_SPORTSMANAGER_DATES_REGISTERED_USERS="Apply dates by registered users"
 COM_SPORTSMANAGER_VIEW_ELO_RATING="View Elo rating"
 COM_SPORTSMANAGER_VIEW_SPORTSMANAGER_LIZENZ="Show License"
+COM_SPORTSMANAGER_VIEW_LEAST_MEMBER_COUNT="Show least member count"
+COM_SPORTSMANAGER_SHOW_ORGANISATION="Show organisation"
+COM_SPORTSMANAGER_SHOW_TOURNAMENT_BRACKET="Show Tournament Bracket"
 COM_SPORTSMANAGER_PLAYER_DETAILS="Player details"
 COM_SPORTSMANAGER_PLAYER_LIST_DETAILS="Player list details"
 COM_SPORTSMANAGER_PLAYER_EDIT="Edit player data by organisation/club contacts"
@@ -380,6 +387,7 @@ COM_SPORTSMANAGER_MEMBER_STATUS="Member status"
 COM_SPORTSMANAGER_ACTIVE="Active"
 COM_SPORTSMANAGER_RESTRICTED="Restricted"
 COM_SPORTSMANAGER_BEATEN="Excreted"
+COM_SPORTSMANAGER_HIDE="Hide"
 COM_SPORTSMANAGER_PASSIVE="Passive"
 COM_SPORTSMANAGER_BEATEN_CLUB="Club excreted"
 COM_SPORTSMANAGER_SINGLE_SEED="Elo starting value singles"
@@ -404,8 +412,9 @@ COM_SPORTSMANAGER_COUNTRY_CODE="Country code"
 COM_SPORTSMANAGER_IMPORT="Import"
 COM_SPORTSMANAGER_IMPORT_MESSAGE="In the import there are only player information about club %s present. Shall only the members of that one club be updated, the associated club has to be selected down here. If the import contains all members of the organisation then the organisation must be selected."
 COM_SPORTSMANAGER_CHECK="Check"
-COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="There are conflicts in the import which have to be fixed manually first."
+COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="There are faults or conflicts in the import which have to be fixed manually first."
 COM_SPORTSMANAGER_IMPORT_DUPLICATE_MESSAGE="Attempt to change player number into one that is already assigned to another player."
+COM_SPORTSMANAGER_IMPORT_WRONG_FORMAT_PLAYERNUMBER="One or more player numbers contain an invalid format"
 COM_SPORTSMANAGER_NAME2="Name"
 COM_SPORTSMANAGER_DATA_IMPORT_ABORT_MESSAGE="The import has been aborted because there are conflicts in the containing player information. Please contact a moderator and attach the import!"
 COM_SPORTSMANAGER_DATA_IMPORT_NO_CONFLICTS="There are conflicts in the containing player information."
@@ -536,6 +545,7 @@ COM_SPORTSMANAGER_FULL_RATING="Full rating"
 COM_SPORTSMANAGER_NO_RATING="No rating"
 COM_SPORTSMANAGER_TEAM_COMPETITIONS="Team competitions"
 COM_SPORTSMANAGER_TABLE_SUMMARY="Table rating"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_RECORD="Head-to-head record"
 COM_SPORTSMANAGER_POINTS_WON_LOST_DIFFERENCE="Game points won, game points lost, point difference"
 COM_SPORTSMANAGER_PERFORMANCE_INDEX="Performance index (GP+ * GP+ * 100) / (GP+ + GP-), game points won, ..."
 COM_SPORTSMANAGER_PERFORMANCE_INDEX2="Performance index (games * P+ * 10) / (P+ + P-), game points won, ..."
@@ -604,7 +614,10 @@ COM_SPORTSMANAGER_ONLY_DETAILED_RATING_POINT_DIFFERENCE="Only detailed ranking b
 COM_SPORTSMANAGER_ONLY_DETAILED_POINTS_AFTER_POINTSRATE="Only detailed ranking by points rate"
 COM_SPORTSMANAGER_KO_SIMPLE_FULL="K.O. (singles or full playout of all places)"
 COM_SPORTSMANAGER_MANUAL_PRO_TEAMS="Manual (per team)"
+COM_SPORTSMANAGER_CUP_DRAW_EVERY_ROUND="Cup: draw every round"
+COM_SPORTSMANAGER_CUP_USING_SEEDING_LIST="Cup: draw seeding list"
 COM_SPORTSMANAGER_SUBDIVISION="Subdivision"
+COM_SPORTSMANAGER_SHOW_MATCHDAY_TITLE="Show title matchday"
 COM_SPORTSMANAGER_ELO_RATING="Elo rating"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_EVENT="Eligibles for competition"
 COM_SPORTSMANAGER_TITLE_LOGO="Title logo"
@@ -632,6 +645,8 @@ COM_SPORTSMANAGER_GAMEDAY="Gameday"
 COM_SPORTSMANAGER_GAMEDAYS="Gamedays"
 COM_SPORTSMANAGER_ROUND="Round"
 COM_SPORTSMANAGER_ROUNDS="Rounds"
+COM_SPORTSMANAGER_ROUND_TITLE="Round Title"
+COM_SPORTSMANAGER_MATCH_PLACE3="Match for place 3"
 COM_SPORTSMANAGER_MONTH="Month"
 COM_SPORTSMANAGER_MONTHS="Months"
 COM_SPORTSMANAGER_PLAYER_FROM_TEAM="Player of team"
@@ -647,7 +662,9 @@ COM_SPORTSMANAGER_SO_FAR="so far"
 COM_SPORTSMANAGER_PLACEMENT_AREA="Placement area"
 COM_SPORTSMANAGER_IMAGE_WITHIN_TEAM="Image within team"
 COM_SPORTSMANAGER_ADD_MEETING="Add match"
+COM_SPORTSMANAGER_GAMEDAY_GENERATION="Generate gameday"
 COM_SPORTSMANAGER_ROUND_GENERATION="Generate round"
+COM_SPORTSMANAGER_CUP_ROUND_GENERATION="Generate cup round"
 COM_SPORTSMANAGER_GENERATE_GROUP_GAME="Generate group games"
 COM_SPORTSMANAGER_Import_GROUP_GAME="Import group games"
 COM_SPORTSMANAGER_Import_GROUP_GAME2="Group games: Import"
@@ -775,6 +792,7 @@ COM_SPORTSMANAGER_FEDERAL_STATES="State"
 COM_SPORTSMANAGER_STATES="Countries"
 COM_SPORTSMANAGER_YEAR="Year"
 COM_SPORTSMANAGER_ADDITION="Addition"
+COM_SPORTSMANAGER_LOCATION="Location"
 COM_SPORTSMANAGER_STATE="Germany"
 COM_SPORTSMANAGER_FEDERAL_="Federal "
 COM_SPORTSMANAGER_INFO="Info"

src/structure/script.php

@@ -137,6 +137,8 @@ return new class () implements InstallerScriptInterface
 		. "\n  `tisch` tinytext DEFAULT NULL,"
 		. "\n  `zeitpunkt` datetime DEFAULT NULL,"
 		. "\n  `spieltag` smallint(6) DEFAULT NULL,"
+		. "\n  `spieltag_titel` VARCHAR(32) NOT NULL DEFAULT '',"
+		. "\n  `spiel_nr` tinyint(4) DEFAULT NULL,"
 		. "\n  `heim_punkte` smallint(6) DEFAULT NULL,"
 		. "\n  `gast_punkte` smallint(6) DEFAULT NULL,"
 		. "\n  `heim_spielpunkte` smallint(6) DEFAULT NULL,"
@@ -680,7 +682,9 @@ return new class () implements InstallerScriptInterface
 		. "\n  `teamgruppe_id` int(11) DEFAULT NULL,"
 		. "\n  `verein_id` int(11) DEFAULT NULL,"
 		. "\n  `veranstaltung_id` int(11) NOT NULL DEFAULT '0',"
-		. "\n  `teamname` varchar(50) NOT NULL,"
+		. "\n  `setzliste_nr` tinyint(4) DEFAULT NULL,"
+		. "\n  `teamname` varchar(50) NOT NULL DEFAULT '',"
+		. "\n  `teamname_kurz` VARCHAR(24) NOT NULL DEFAULT '',"
 		. "\n  `tischtyp` varchar(200) DEFAULT NULL,"
 		. "\n  `tischeigenschaften` varchar(200) DEFAULT NULL,"
 		. "\n  `zusatzpunkte` float(6,2) DEFAULT NULL,"
@@ -1033,12 +1037,14 @@ return new class () implements InstallerScriptInterface
 		. "\n  `modus_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `verschieberegel_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `tabellenwertung` tinyint(4) NOT NULL DEFAULT '0',"
+		. "\n  `direktervergleich` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `unterteilung` tinyint(4) NOT NULL DEFAULT '0',"
+		. "\n  `spieltag_titel_zeigen` INT(4) NOT NULL DEFAULT '0',"
 		. "\n  `erster_tag` date NOT NULL DEFAULT '0000-00-00',"
 		. "\n  `letzter_tag` date DEFAULT NULL,"
 		. "\n  `elo_wertung` tinyint(4) DEFAULT NULL,"
-	  . "\n  `logo_url` TINYTEXT NOT NULL,"
+		. "\n  `logo_url` TINYTEXT NOT NULL,"
-	  . "\n  `ticker_logo_url` TINYTEXT NOT NULL,"
+		. "\n  `ticker_logo_url` TINYTEXT NOT NULL,"
 		. "\n  `status` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `reihenfolge` tinyint(4) DEFAULT '1',"
 		. "\n  `kategorie` tinyint(4) DEFAULT '1',"
@@ -1060,6 +1066,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `url` varchar(150) DEFAULT NULL,"
 		. "\n  `beschreibung` varchar(500) DEFAULT NULL,"
 		. "\n  `ausgetreten` tinyint(1) DEFAULT '0',"
+		. "\n  `verstecken` INT(4) NOT NULL DEFAULT '0',"
 		. "\n  PRIMARY KEY (`verein_id`),"
 		. "\n  KEY `veranstalter_id` (`veranstalter_id`)"
 	  . "\n) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
@@ -1110,7 +1117,7 @@ return new class () implements InstallerScriptInterface
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
-		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '103';";
+		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '106';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 

src/structure/sportsmanager.xml

@@ -6,7 +6,7 @@
   <authorEmail>it@dtfb.de</authorEmail>
   <copyright>All rights reserved</copyright>
   <license>GNU/GPL</license>
-  <version>2.0.0</version>
+  <version>DEV</version>
   <description>Verwaltung von Spielern und Vereinen in Mannschafts- und Individualwettbewerben</description>
   <namespace path="src">Dtfb\Component\com_sportsmanager</namespace>
   <files folder="site">