Merge pull request #305 from Deutscher-Tischfussballbund/sportsmanager2-issue289

Zusatzinfo-Feld für Spielorte

.github/workflows/dev_preview.yml

@@ -0,0 +1,84 @@
+# Builds the codebase and publishes a rolling dev-preview release (no version bump).
+# The release uses a fixed tag "dev-preview" so each run replaces the previous one.
+
+name: Sportsmanager Dev Preview
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to build'
+        required: true
+        default: 'sportsmanager2-prod'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run build script
+        run: npm run release
+
+      - name: Delete existing dev-preview release (if any)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+        run: |
+          release_id=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+            "https://api.github.com/repos/$REPO/releases/tags/dev-preview" \
+            | jq -r '.id // empty')
+
+          if [ -n "$release_id" ]; then
+            curl -s -X DELETE -H "Authorization: token $GITHUB_TOKEN" \
+              "https://api.github.com/repos/$REPO/releases/$release_id"
+            echo "Deleted existing dev-preview release (ID: $release_id)"
+          else
+            echo "No existing dev-preview release found"
+          fi
+
+      - name: Delete existing dev-preview tag (if any)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+        run: |
+          status=$(curl -s -o /dev/null -w "%{http_code}" \
+            -H "Authorization: token $GITHUB_TOKEN" \
+            "https://api.github.com/repos/$REPO/git/refs/tags/dev-preview")
+
+          if [ "$status" = "200" ]; then
+            curl -s -X DELETE -H "Authorization: token $GITHUB_TOKEN" \
+              "https://api.github.com/repos/$REPO/git/refs/tags/dev-preview"
+            echo "Deleted existing dev-preview tag"
+          else
+            echo "No existing dev-preview tag found"
+          fi
+
+      - name: Publish dev-preview release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: dev-preview
+          name: "Dev Preview (${{ github.run_number }})"
+          body: |
+            Automated dev preview build from branch `${{ inputs.branch }}`.
+            Commit: ${{ github.sha }}
+            Run: ${{ github.run_number }}
+
+            > This is a temporary preview release and will be replaced on the next run.
+          files: package/packages/com_sportsmanager.zip
+          draft: false
+          prerelease: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package-lock.json

@@ -52,7 +52,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.0.tgz",
       "integrity": "sha512-iV7Gwg0DePKvdDZZWRTkj4MW+6/AbVWd4ZCg+zk8H1RVt5xBpUZS6vLQWwb3pyLg4BFTaGiQCPoJ4Ibmbne4fA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/generator": "^7.12.0",
@@ -2695,10 +2694,25 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001148",
+      "version": "1.0.30001810",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz",
-      "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==",
+      "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==",
-      "dev": true
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "1.1.3",

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

@@ -30,6 +30,8 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION="Beschreibung"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION_DESC="Beschreibung, die unterhalb des Titels angezeigt wird (WICHTIG: Werden HTML-Tags verwendet, müssen auch Umlaute in HTML-Code angeben werden)"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES="Kategorien"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="Eine optionale Auswahl von Kategorienummern durch Kommata oder Spiegelstrich getrennt"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_EXTRA_PARAMS="Zusätzliche Parameter"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_EXTRA_PARAMS_DESC="Optionale zusätzliche Parameter für den Link in der Form Name1=Wert1&Name2=Wert2, die bei Aufruf dieses Menüpunkts wie GET-Parameter zur Verfügung stehen"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_TITLE="Layout: Elo-Rangliste"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_DESC="Auflistung der Spieler sortiert nach Elo-Wertung"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_OPTION_ELO_RANKING="Elo-Rangliste"

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

@@ -30,6 +30,8 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION="Description"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION_DESC="Description that will be shows below the titel (IMPORTANT: if html tags are used, special characters must be maskeraded)"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES="Categories"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="An optional selection of category numbers seperated by commas or bullet point"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_EXTRA_PARAMS="Additional parameters"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_EXTRA_PARAMS_DESC="Optional additional parameters for the link in the form name1=value1&name2=value2, made available as GET parameters whenever this menu item is called"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_TITLE="Layout: elo ranking"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_DESC="Listing of players sorted by elo rating"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_OPTION_ELO_RANKING="Elo ranking"

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

@@ -5708,6 +5708,85 @@ function updateDatabase(): void
         }
     }
 
+    if ($datenbank_version < 120) {
+
+        $columns = $db->getTableColumns('#__sportsmanager_teamspiel_modus');
+        if (!array_key_exists('spiele_in_spielerstatistik', $columns)){
+            $query = "ALTER TABLE `#__sportsmanager_teamspiel_modus`"
+                . "\n ADD `spiele_in_spielerstatistik` INT(4) NOT NULL DEFAULT '0' AFTER `heimtausch`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+		}
+
+        $columns = $db->getTableColumns('#__sportsmanager_bestenliste_punkte');
+        if (!array_key_exists('team_id', $columns)){
+            $query = "ALTER TABLE `#__sportsmanager_bestenliste_punkte`"
+                . "\n  ADD `team_id` INT(11) NULL DEFAULT NULL AFTER `spieler_2_id`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+		$spielerstatistik_aktualisieren = true;
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '120'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+
+    if ($datenbank_version < 121) {
+
+        $columns = $db->getTableColumns('#__sportsmanager_mitglied_von_halloffame');
+        if (!array_key_exists('teamspieler', $columns)){
+            $query = "ALTER TABLE `#__sportsmanager_mitglied_von_halloffame`"
+                . "\n ADD `teamspieler` TEXT NULL DEFAULT NULL AFTER `teamname`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+        if (!array_key_exists('nicht_ausgespielt', $columns)){
+            $query = "ALTER TABLE `#__sportsmanager_mitglied_von_halloffame`"
+                . "\n ADD `nicht_ausgespielt` TINYINT(1) NOT NULL DEFAULT '0' AFTER `jahr`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+        $columns = $db->getTableColumns('#__sportsmanager_spielort');
+        if (!array_key_exists('zusatzinfo', $columns)){
+            $query = "ALTER TABLE `#__sportsmanager_spielort`"
+                . "\n ADD `zusatzinfo` TEXT NULL DEFAULT NULL AFTER `ruhetage`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+        $zielpfad = JPATH_ROOT . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . 'spieler' . DIRECTORY_SEPARATOR . 'n.png';
+        if (!is_file($zielpfad)) {
+            $quellpfad = JPATH_SITE . DIRECTORY_SEPARATOR . 'components' . DIRECTORY_SEPARATOR . 'com_sportsmanager' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'spieler-n.png';
+            bildKopierenAngepasst($quellpfad, $zielpfad, 180, 240, 1);
+        }
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '121'"
+            . "\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";

src/structure/components/com_sportsmanager/tools.php

@@ -19,11 +19,17 @@ require_once JPATH_SITE . '/components/com_sportsmanager/database/init.php';
 
 /** @noinspection PhpUnused */
 function mathParserVerteilung($rohpunkte, $platz, $teilnehmer, $multiplikator) {
+	if ($teilnehmer <= 1){
+		return 0;
+	}
     return max(round($multiplikator * round(((($rohpunkte - 1) * (-log($platz / $teilnehmer) * (1 - ($platz / $teilnehmer)))) / (-log(1 / $teilnehmer) * (1 - (1 / $teilnehmer)))) + 1)), 1);
 }
 
 /** @noinspection PhpUnused */
 function mathParserVerteilungR($rohpunkte, $platz, $teilnehmer, $multiplikator) {
+	if ($teilnehmer <= 1){
+		return 0;
+	}
     return max(round(((($multiplikator * $rohpunkte - 1) * (-log($platz / $teilnehmer) * (1 - ($platz / $teilnehmer)))) / (-log(1 / $teilnehmer) * (1 - (1 / $teilnehmer)))) + 1), 1);
 }
 
@@ -226,6 +232,217 @@ function kategorieFilter($prefix, $suffix = ""): string
     return " $prefix (" . implode(", ", $filter) . ") $suffix";
 }
 
+function idListeParameterFilter(string $parameterName, string $prefix, string $suffix = ""): string
+{
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+    $werte = $jInput->get($parameterName, '', 'STRING');
+
+    $result = [];
+    foreach (explode(",", $werte) as $item) {
+        $item = trim($item);
+        if ($item === '') continue;
+
+        $num = intval($item);
+        if ($num > 0) {
+            $result[$num] = true; // Duplikate vermeiden
+        }
+    }
+
+    if (empty($result)) {
+        return "";
+    }
+
+    $filter = array_keys($result);
+    sort($filter, SORT_NUMERIC);
+
+    return " $prefix (" . implode(", ", $filter) . ") $suffix";
+}
+
+function halloffameIdFilter($prefix): string
+{
+    // Keine Bereichssuche bei der Halloffame-Id, nur einzelne Werte
+    return idListeParameterFilter('halloffame_id', $prefix);
+}
+
+function halloffameJahrFilter($prefix): string
+{
+    $minJahr = 1900;
+    $maxJahr = (int) date('Y') + 5;
+
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+    $werte = $jInput->get('jahr', '', 'STRING');
+
+    $result = [];
+    foreach (explode(",", $werte) as $item) {
+        $item = trim($item);
+        if ($item === '') continue;
+
+        // Prüfen, ob es ein Bereich ist
+        if (strpos($item, '-') !== false) {
+            $rangeParts = explode('-', $item);
+
+            // genau 2 Teile für einen gültigen Bereich
+            if (count($rangeParts) !== 2) continue;
+
+            $start = intval(trim($rangeParts[0]));
+            $end = intval(trim($rangeParts[1]));
+
+            if ($start <= 0 || $end <= 0) continue;
+
+            // Werte vertauschen, falls der 2. Wert kleiner als der 1. ist
+            if ($end < $start) {
+                [$start, $end] = [$end, $start];
+            }
+
+            // Bereich auf 1900 .. aktuelles Jahr+5 begrenzen
+            $start = max($start, $minJahr);
+            $end = min($end, $maxJahr);
+
+            if ($start > $end) continue;
+
+            for ($i = $start; $i <= $end; $i++) {
+                $result[$i] = true; // Duplikate vermeiden
+            }
+        } else {
+            $num = intval($item);
+            if ($num <= 0) continue;
+
+            // Einzelwert auf 1900 .. aktuelles Jahr+5 begrenzen
+            $num = max($minJahr, min($maxJahr, $num));
+            $result[$num] = true;
+        }
+    }
+
+    if (empty($result)) {
+        return "";
+    }
+
+    $filter = array_keys($result);
+    sort($filter, SORT_NUMERIC);
+
+    return " $prefix (" . implode(", ", $filter) . ")";
+}
+
+function halloffameAlleTeams($db): array
+{
+    return loadObjectList($db, "SELECT team_id, teamname FROM #__sportsmanager_team ORDER BY team_id DESC");
+}
+
+function halloffameTeamIdFuerTeamname(array $alleTeams, ?string $teamname)
+{
+    if (empty($teamname))
+        return null;
+    foreach ($alleTeams as $team) {
+        if (str_starts_with($team->teamname, $teamname))
+            return $team->team_id;
+    }
+    return null;
+}
+
+function halloffameAlleSpielerInfo($db): array
+{
+    // "Aktiv" = hat einen aktuellen Verein; ohne aktuellen Verein liefert spieler_details ohnehin keine Daten
+    $rows = loadObjectList($db, "SELECT spieler_id, geschlecht, aktueller_verein_id FROM #__sportsmanager_spieler");
+    $result = [];
+    foreach ($rows as $row) {
+        $result[$row->spieler_id] = (object) [
+            'geschlecht' => $row->geschlecht,
+            'aktiv'      => !empty($row->aktueller_verein_id),
+        ];
+    }
+    return $result;
+}
+
+function halloffameSpielerAktiv(array $alleSpielerInfo, $spieler_id): bool
+{
+    return empty($spieler_id) || !isset($alleSpielerInfo[$spieler_id]) || $alleSpielerInfo[$spieler_id]->aktiv;
+}
+
+function halloffameSpielerBildId(array $alleSpielerInfo, $spieler_id)
+{
+    return halloffameSpielerAktiv($alleSpielerInfo, $spieler_id) ? $spieler_id : '';
+}
+
+function halloffameSpielerBildAlternativ(array $alleSpielerInfo, $spieler_id, string $geschaetztesGeschlecht = ''): string
+{
+    if (!empty($spieler_id) && isset($alleSpielerInfo[$spieler_id]))
+        return $alleSpielerInfo[$spieler_id]->geschlecht == 'M' ? 'm' : 'w';
+    if ($geschaetztesGeschlecht === 'M')
+        return 'm';
+    if ($geschaetztesGeschlecht === 'W')
+        return 'w';
+    return 'n';
+}
+
+function halloffameGeschlechtZaehlen(object $ziel, array $alleSpielerInfo, $spieler1_id, $spieler2_id): void
+{
+    foreach ([$spieler1_id, $spieler2_id] as $id) {
+        if (empty($id) || !isset($alleSpielerInfo[$id]))
+            continue;
+        if ($alleSpielerInfo[$id]->geschlecht == 'M')
+            $ziel->anzahl_m++;
+        else
+            $ziel->anzahl_w++;
+    }
+}
+
+function halloffameGeschaetztesGeschlecht($anzahl_m, $anzahl_w): string
+{
+    if ($anzahl_m > $anzahl_w)
+        return 'M';
+    if ($anzahl_w > $anzahl_m)
+        return 'W';
+    return '';
+}
+
+function halloffameAlleVereineInfo($db): array
+{
+    $rows = loadObjectList($db, "SELECT verein_id, ausgetreten FROM #__sportsmanager_verein");
+    $result = [];
+    foreach ($rows as $row) {
+        $result[$row->verein_id] = (object) [
+            'aktiv' => empty($row->ausgetreten),
+        ];
+    }
+    return $result;
+}
+
+function halloffameVereinAktiv(array $alleVereineInfo, $verein_id): bool
+{
+    return empty($verein_id) || !isset($alleVereineInfo[$verein_id]) || $alleVereineInfo[$verein_id]->aktiv;
+}
+
+function halloffameNameLink(string $bild_type, $id, array $alleSpielerInfo, array $alleVereineInfo, string $nameHtml): string
+{
+    if (empty($id))
+        return $nameHtml;
+    if ($bild_type === 'spieler' && !halloffameSpielerAktiv($alleSpielerInfo, $id))
+        return $nameHtml;
+    if ($bild_type === 'vereine' && !halloffameVereinAktiv($alleVereineInfo, $id))
+        return $nameHtml;
+
+    $tasks = ['spieler' => 'spieler_details', 'vereine' => 'verein_details', 'mannschaften' => 'team_details'];
+    if (!isset($tasks[$bild_type]))
+        return $nameHtml;
+
+    return '<a href="' . SportsManagerURL('&task=' . $tasks[$bild_type] . '&id=' . $id) . '">' . $nameHtml . '</a>';
+}
+
+function halloffameTitel(): string
+{
+    global $params;
+
+    $titel = trim((string) $params->get('titel', ''));
+    if ($titel !== '')
+        return $titel;
+
+    $menu = Factory::getContainer()->get(SiteApplication::class)->getMenu()->getActive();
+    if ($menu !== null && trim((string) $menu->title) !== '')
+        return $menu->title;
+
+    return '';
+}
+
 function turnierFilter($prefix): string
 {
     $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;

src/structure/components/com_sportsmanager/views/sportsmanager/tmpl/default.xml

@@ -45,6 +45,11 @@
       default=""
       label="COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES"
       description="COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC" />
+      <field name="zusatzparameter"
+      type="text"
+      default=""
+      label="COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_EXTRA_PARAMS"
+      description="COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_EXTRA_PARAMS_DESC" />
       </fieldset>
     </fields>
 </metadata>

src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php

@@ -2886,7 +2886,7 @@ class HTML_sportsmanager_admin
             <span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>">&nbsp;</span>
             <?php
         }
-		
+
 		if (!empty($nichtAktualisierteUnterschiede)){
             ?>
             <table class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
@@ -3539,7 +3539,7 @@ class HTML_sportsmanager_admin
         <?php
     }
 
-    static function adminVereine($rows, $organisationAnzeigen): void
+    static function adminVereine($rows, $organisationAnzeigen, $ansprechpartner): void
     {
         global $params;
 
@@ -3599,6 +3599,8 @@ class HTML_sportsmanager_admin
                 <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_MEMBERS'); ?></strong></th>
                 <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM_SEAT'); ?></strong></th>
                 <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_BEATEN'); ?></strong></th>
+				<th></th>
+				<th></th>
             </tr>
             <?php
 
@@ -3661,7 +3663,15 @@ class HTML_sportsmanager_admin
                     </td>
                     <td nowrap><?php if (!empty($row->vereinssitz)) echo htmlentities_utf8($row->vereinssitz . (!empty($row->vereinssitz_ortsteil) ? ("-" . $row->vereinssitz_ortsteil) : "")); ?></td>
                     <td nowrap><?php echo $row->ausgetreten ? Text::_('COM_SPORTSMANAGER_YES') : Text::_('COM_SPORTSMANAGER_NO'); ?></td>
-                    <td nowrap><small><a
+                    <td>
+					<?PHP
+					if (!empty($ansprechpartner[$row->verein_id])){
+						$emails = implode(';', $ansprechpartner[$row->verein_id]);
+						echo "<a href='mailto:" . $emails . "?subject=" . $row->vereinsname . "'>E-Mail</a>&nbsp;";
+					}
+					?>
+					</td>
+					<td nowrap><small><a
                                 href="<?php echo SportsManagerURL('&task=admin_verein_remove&id=' . $row->verein_id); ?>"
                                 onclick="return confirm('<?php echo Text::_('COM_SPORTSMANAGER_WANT_REALLY_REMOVE'); ?>');"
                                 title="<?php echo Text::_('COM_SPORTSMANAGER_REMOVE'); ?>">X</a></small></td>
@@ -4426,6 +4436,17 @@ class HTML_sportsmanager_admin
 								   value="<?php if ($row != null) echo htmlentities_utf8($row->ruhetage); ?>"/>
 						</td>
 					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
+							<label
+								for="zusatzinfo"><?php echo Text::_('COM_SPORTSMANAGER_ADDITIONAL_INFO'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+					<textarea name="zusatzinfo" id="zusatzinfo" cols="60"
+							  rows="8"><?php if ($row != null) echo htmlentities_utf8($row->zusatzinfo); ?></textarea>
+						</td>
+					</tr>
 					<tr>
 						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
 							<label
@@ -4834,6 +4855,29 @@ class HTML_sportsmanager_admin
                                             </select>
                                         </td>
                                     </tr>
+
+
+                                    <tr>
+                                        <td nowrap style="width: 20%; text-align: right">
+                                            <label
+                                                for="games_in_statistik"><?php echo Text::_('COM_SPORTSMANAGER_GAMES_IN_STATISTIK'); ?>
+                                                :</label>
+                                        </td>
+                                        <td nowrap>
+                                            <select class="uk-select uk-form-width-medium" name="spiele_in_spielerstatistik"
+											id="games_in_statistik" size="1">
+												<option value="0"><?php echo Text::_('COM_SPORTSMANAGER_GAMES_IN_STATISTIK_ALL'); ?></option>
+												<?php
+                                                for ($i = 1; $i <= 36; $i++) {
+                                                    echo "<option value=\"" . $i . "\"" . ($row != null ? ($row->spiele_in_spielerstatistik == $i ? " selected" : "") : "") . ">" . $i . "</option>";
+                                                }
+                                                ?>
+                                            </select>
+                                        </td>
+                                    </tr>
+
+
+
                                     <tr>
                                         <td nowrap style="width: 20%; text-align: right">
                                             <label for="status"><?php echo Text::_('COM_SPORTSMANAGER_ACTIVE'); ?>
@@ -6362,8 +6406,13 @@ class HTML_sportsmanager_admin
                                             <select class="uk-select uk-form-width-large" name="tabellenwertung"
                                                     id="table_evaluation" size="1">
                                                 <?php
-                                                $typ = array(Text::_('COM_SPORTSMANAGER_POINTS_WON_LOST_DIFFERENCE'), Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX'), Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX2'));
+                                                $typ = array(0 => Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX0'),
-                                                for ($i = 0; $i <= 2; $i++) {
+															 1 => Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX1'),
+															 2 => Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX2'),
+															 3 => Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX3'),
+															 4 => Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX4'),
+															 5 => Text::_('COM_SPORTSMANAGER_PERFORMANCE_INDEX5'));
+                                                for ($i = 0; $i <= 5; $i++) {
                                                     echo "<option value=\"" . $i . "\"" . ($spielerstatistik != null ? ($spielerstatistik->tabellenwertung == $i ? " selected" : "") : "") . ">" . htmlentities_utf8($typ[$i]) . "</option>";
                                                 }
                                                 ?>
@@ -6890,12 +6939,12 @@ class HTML_sportsmanager_admin
         <?php
     }
 
-	static function adminMailto($to,$cc,$bcc,$subject,$message,$backtomail,$backtosender,$vorlage=''): void 
+	static function adminMailto($to,$cc,$bcc,$subject,$message,$backtomail,$backtosender,$vorlage=''): void
 	{
         global $params;
         ?>
         <div class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_EMAIL_SEND'); ?></div>
-		
+
 		<form id="mailForm">
             <div class="uk-overflow-auto">
                 <table style="width: 100%">
@@ -6944,8 +6993,8 @@ class HTML_sportsmanager_admin
 				<input type="submit" name="joomlamail" value="<?php echo Text::_('COM_SPORTSMANAGER_EMAIL_SEND'); ?>&nbsp;(joomla)" class="button"/>
 				<?php if ($vorlage->name == "Ordnungsstrafe"){ ?>
 				<input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_EDIT_DISCIPLINARY_FINE'); ?>" class="button"
-				       onclick="const t = this.form.task; t.value = 'admin_ordnungsstrafe_edit';"/>	
+				       onclick="const t = this.form.task; t.value = 'admin_ordnungsstrafe_edit';"/>
-				<input type="hidden" name="id" value="<?php echo $vorlage->id; ?>"/>					   
+				<input type="hidden" name="id" value="<?php echo $vorlage->id; ?>"/>
 				<?php } ?>
 				<input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_BACK'); ?>" class="button"
 				       onclick="const t = this.form.task; t.value = '<?php echo $backtosender; ?>';"/>
@@ -7008,7 +7057,7 @@ class HTML_sportsmanager_admin
         <div
             class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_DISCIPLINARY_FINES'); ?>
             : <?php echo Text::_('COM_SPORTSMANAGER_JOOMLA_MANAGEMENT'); ?></div>
-		
+
 		<table style="border-spacing: 10px">
             <tr>
                 <td nowrap><a
@@ -7029,7 +7078,7 @@ class HTML_sportsmanager_admin
             </tr>
 			<?php } ?>
         </table>
-		
+
 		<?php if (count($saisons) > 0) {
 			?>
 			<form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
@@ -7238,12 +7287,12 @@ class HTML_sportsmanager_admin
 								   size="1" style='height: 34px; width: 200px;' readonly
 								   value="<?php echo (empty($row->versendedatum) ? '' : $row->versendedatum); ?>"/>
 							<?php if ($row != null){ ?>
-							<input type="submit" name="set_versender" 
+							<input type="submit" name="set_versender"
 									value="<?php echo (empty($row->versendedatum) ? 'set' : 'reset'); ?>" class="button"/>
 							<?php } ?>
 						</td>
 					</tr>
-					
+
 					<tr>
 						<td nowrap style="width: 20%; text-align: right">
 							<label
@@ -7261,7 +7310,7 @@ class HTML_sportsmanager_admin
 								   size="1" style='height: 34px; width: 200px;' readonly
 								   value="<?php echo (empty($row->rechnungsdatum) ? '' : $row->rechnungsdatum); ?>"/>
 							<?php if ($row != null && !empty($row->versendedatum)){ ?>
-							<input type="submit" name="set_rechnung" 
+							<input type="submit" name="set_rechnung"
 									value="<?php echo (empty($row->rechnungsdatum) ? 'set' : 'reset'); ?>" class="button"/>
 							<?php } ?>
 						</td>
@@ -7299,8 +7348,8 @@ class HTML_sportsmanager_admin
             <input type="submit" name="save" value="<?php echo Text::_('COM_SPORTSMANAGER_SAVE'); ?>" class="button"/>
 			<?php if ($row != null && benutzerZugriff("benutzerVeranstalterModerator")){ ?>
 			<input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_SEND_DISCIPLINARY_FINE'); ?>" class="button"
-				   onclick="const t = this.form.task; t.value = 'admin_ordnungsstrafe_mailen';"/>	
+				   onclick="const t = this.form.task; t.value = 'admin_ordnungsstrafe_mailen';"/>
-			<input type="hidden" name="id" value="<?php echo $row->ordnungsstrafen_id; ?>"/>					   
+			<input type="hidden" name="id" value="<?php echo $row->ordnungsstrafen_id; ?>"/>
 			<?php } ?>
             <input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_CANCEL'); ?>" class="button"/>
             <input type="hidden" name="task" value="admin_ordnungsstrafe_save"/>
@@ -7322,7 +7371,7 @@ class HTML_sportsmanager_admin
         <div
             class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_MATCH_RESCHEDULINGS'); ?>
             : <?php echo Text::_('COM_SPORTSMANAGER_JOOMLA_MANAGEMENT'); ?></div>
-		
+
 		<table style="border-spacing: 10px">
             <tr>
                 <td nowrap><a
@@ -7382,13 +7431,13 @@ class HTML_sportsmanager_admin
 		<?php
 		if (count($rows) > 0) {
 			$k = 0;
-			foreach ($rows as $row) { 
+			foreach ($rows as $row) {
 			?>
 				<tr class="sectiontableentry<?php echo $k + 1;
 				$k = ($k + 1) % 2; ?><?php echo $params->get('pageclass_sfx'); ?>">
 					<td nowrap style='text-align: center;'>
-						<a href="<?php 
+						<a href="<?php
-						echo SportsManagerURL('&task=admin_spielverlegung_edit&begegnung_id=' . $row->begegnung_id); 
+						echo SportsManagerURL('&task=admin_spielverlegung_edit&begegnung_id=' . $row->begegnung_id);
 						?>">
 						<?php echo $row->begegnung_id; ?>
 						</a>
@@ -7397,7 +7446,7 @@ class HTML_sportsmanager_admin
 						<?php echo htmlentities_utf8($row->Liga); ?>
 					</td>
 					<td nowrap style='text-align: center;'>
-						<?php 
+						<?php
 						if ($row->Heim == $row->beantragt_von)
 							echo "<u>" . htmlentities_utf8($row->Heim) . "</u>";
 						else
@@ -7438,7 +7487,7 @@ class HTML_sportsmanager_admin
 		</div>
 		<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>">&nbsp;</span>
 		<?php
-	} 
+	}
 
     static function adminEditSpielverlegung($row,$teams): void
     {
@@ -7596,7 +7645,7 @@ class HTML_sportsmanager_admin
 						   setTimeout(() => { t.value = 'admin_verbandsorgane'; }, 100);"/>
 				<input type="hidden" name="task" value="admin_verbandsorgane"/>
 			</form>
-			
+
             <?php
         }
     }
@@ -7922,7 +7971,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 						</td>
 					</tr>
 				</table>
-				
+
             </div>
             <input type="submit" name="save" value="<?php echo Text::_('COM_SPORTSMANAGER_SAVE'); ?>" class="button"/>
             <input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_CANCEL'); ?>" class="button"/>
@@ -7932,7 +7981,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
         </form>
         <?php
     }
-	
+
     static function adminHalloffame($rows): void
     {
         global $params;
@@ -8129,6 +8178,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 
 		<?php
 		if ($rows != null) {
+		$einspaltigesDoppel = ($halloffame->spielform == 2 && !$halloffame->platz2_zeigen && !$halloffame->platz3_zeigen);
 		?>
 		<div class="uk-overflow-auto">
 		<table style='border-collapse: collapse;'
@@ -8139,12 +8189,12 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 					<strong><?php echo Text::_('COM_SPORTSMANAGER_YEAR'); ?></strong>
 				</th>
 
-				<?php 
+				<?php
 				for ($i = 1; $i <= 3; $i++) {
 				if ($i == 2 && !$halloffame->platz2_zeigen) continue;
 				if ($i == 3 && !$halloffame->platz3_zeigen) continue;
 				?>
-					<th style="text-align:center;" colspan="2" nowrap>
+					<th style="text-align:center;" colspan="<?php echo $einspaltigesDoppel ? 4 : 2; ?>" nowrap>
 						<strong><?php echo Text::_('COM_SPORTSMANAGER_PLACE') . " " . $i; ?></strong>
 					</th>
 				<?php } ?>
@@ -8160,7 +8210,42 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 				$rowclass = "sectiontableentry" . ($k + 1) . $params->get('pageclass_sfx');
 				$k = ($k + 1) % 2;
 
-				if ($halloffame->spielform == 2) {
+				if ($halloffame->spielform == 2 && $einspaltigesDoppel) {
+			?>
+
+				<tr class="<?php echo $rowclass; ?>">
+
+					<td nowrap style="text-align:center;">
+						<a href="<?php echo SportsManagerURL('&task=admin_halloffame_mitglied_edit&halloffame_id=' . $halloffame->halloffame_id . '&jahr=' . $row->jahr); ?>">
+							<?php echo $row->jahr; ?>
+						</a>
+					</td>
+
+					<td nowrap style="text-align:center; width:70px;">
+						<?php echo bildHTML("spieler", $row->spieler1_id_1, 45, 60, 0, 0, 'border="0"'); ?>
+					</td>
+					<td nowrap style="text-align:left; width:300px;">
+						<?php echo htmlentities_utf8($row->spieler1_1); ?>
+					</td>
+					<td nowrap style="text-align:center; width:70px;">
+						<?php echo bildHTML("spieler", $row->spieler2_id_1, 45, 60, 0, 0, 'border="0"'); ?>
+					</td>
+					<td nowrap style="text-align:left; width:300px;">
+						<?php echo htmlentities_utf8($row->spieler2_1); ?>
+					</td>
+
+					<td nowrap>
+						<small>
+							<a href="<?php echo SportsManagerURL('&task=admin_halloffame_mitglied_remove&halloffame_id=' . $halloffame->halloffame_id . '&jahr=' . $row->jahr); ?>"
+							   onclick="return confirm('<?php echo Text::_('COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME_YEAR'); ?>');"
+							   title="<?php echo Text::_('COM_SPORTSMANAGER_REMOVE'); ?>">
+								X
+							</a>
+						</small>
+					</td>
+				</tr>
+				<?php
+				} else if ($halloffame->spielform == 2) {
 			?>
 
 				<!-- Erste Zeile -->
@@ -8228,9 +8313,13 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 						if ($i == 2 && !$halloffame->platz2_zeigen) continue;
 						if ($i == 3 && !$halloffame->platz3_zeigen) continue;
 						if ($halloffame->spielform == 1) {
-							$id  = "verein_id_" . $i;
 							$txt = "teamname_" . $i;
+							$id  = "verein_id_" . $i;
 							$type = "vereine";
+							if ($row->$id == ""){
+								$id  = "team_id_" . $i;
+								$type = "mannschaften";
+							}
 						} else {
 							$id  = "spieler1_id_" . $i;
 							$txt = "spieler1_" . $i;
@@ -8268,11 +8357,58 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
     static function adminEditHalloffameMitglied($row,$halloffame,$vereine,$spieler,$jahre): void
     {
         global $params;
+
+        // Options nur einmal aufbauen (statt bis zu 6x je Formular) - bei grossen Spieler-/Vereinslisten deutlich schneller
+        $vereineOptionsHtml = '';
+        $spielerOptionsHtml = '';
+        if ($halloffame->spielform == 1) {
+            $vereineAktiv = array();
+            $vereineInaktiv = array();
+            foreach ($vereine as $v) {
+                if (empty($v->ausgetreten))
+                    $vereineAktiv[] = $v;
+                else
+                    $vereineInaktiv[] = $v;
+            }
+            $ausgetretenSuffix = " (" . Text::_('COM_SPORTSMANAGER_BEATEN') . ")";
+
+            $vereineOptionsHtml = '<option value="0"></option>';
+            $vereineOptionsHtml .= '<optgroup label="' . htmlentities_utf8(Text::_('COM_SPORTSMANAGER_ACTIVE_CLUBS')) . '">';
+            foreach ($vereineAktiv as $v)
+                $vereineOptionsHtml .= '<option value="' . $v->verein_id . '">' . htmlentities_utf8($v->verein) . '</option>';
+            $vereineOptionsHtml .= '</optgroup>';
+            $vereineOptionsHtml .= '<optgroup label="' . htmlentities_utf8(Text::_('COM_SPORTSMANAGER_INACTIVE_CLUBS')) . '">';
+            foreach ($vereineInaktiv as $v)
+                $vereineOptionsHtml .= '<option value="' . $v->verein_id . '">' . htmlentities_utf8($v->verein . $ausgetretenSuffix) . '</option>';
+            $vereineOptionsHtml .= '</optgroup>';
+        } else {
+            $spielerOptionsHtml = '<option value="0"></option>';
+            foreach ($spieler as $s)
+                $spielerOptionsHtml .= '<option value="' . $s->spieler_id . '">' . htmlentities_utf8($s->spieler) . '</option>';
+        }
         ?>
         <div
             class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo htmlentities_utf8($halloffame->halloffame); ?>
             : <?php echo($row != null ? Text::_('COM_SPORTSMANAGER_CHANGING') : Text::_('COM_SPORTSMANAGER_ADD')); ?></div>
 
+        <template id="halloffame-vereine-options"><?php echo $vereineOptionsHtml; ?></template>
+        <template id="halloffame-spieler-options"><?php echo $spielerOptionsHtml; ?></template>
+
+        <script type="text/javascript">
+            function halloffameNichtAusgespieltUmschalten(deaktiviert) {
+                document.querySelectorAll('.halloffame-platz-zeile input, .halloffame-platz-zeile select, .halloffame-platz-zeile textarea').forEach(function (feld) {
+                    feld.disabled = deaktiviert;
+                });
+            }
+
+            function halloffameOptionenFuellen(selectId, templateId, wert) {
+                var select = document.getElementById(selectId);
+                var template = document.getElementById(templateId);
+                select.innerHTML = template.innerHTML;
+                if (wert) select.value = wert;
+            }
+        </script>
+
         <form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm"
               enctype="multipart/form-data">
             <div class="uk-overflow-auto">
@@ -8291,84 +8427,94 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								}
 								?>
 							</select>
+							&nbsp;&nbsp;
+							<label for="nicht_ausgespielt">
+								<input type="checkbox" name="nicht_ausgespielt" id="nicht_ausgespielt" value="1"
+									   onclick="halloffameNichtAusgespieltUmschalten(this.checked);"
+									   <?php echo ($row != null && !empty($row->nicht_ausgespielt)) ? " checked" : ""; ?> />
+								<?php echo Text::_('COM_SPORTSMANAGER_HALL_OF_FAME_NOT_HELD'); ?>
+							</label>
 						</td>
 					</tr>
-					<?php 
+					<?php
-					for ($p = 1; $p <= 3; $p++){ 
+					for ($p = 1; $p <= 3; $p++){
 						if ($halloffame->spielform == 1){
 							$index_vereinid = "verein_id_" . $p;
 							$index_team = "teamname_" . $p;
+							$index_teamspieler = "teamspieler_" . $p;
 							?>
-							<tr>
+							<tr class="halloffame-platz-zeile">
 								<td nowrap style="width: 20%; text-align: right">
 									<label for="verein1_<?php echo $p; ?>"><?php echo Text::_('COM_SPORTSMANAGER_PLACE') . " " . $p; ?>
 										:</label>
 								</td>
 								<td nowrap>
 									<select class="uk-select uk-form-width-large" name="verein_id_<?php echo $p; ?>"
-											id="verein_id_<?php echo $p; ?>" size="1" style="width: 370px;">
+											id="verein_id_<?php echo $p; ?>" size="1" style="width: 370px;"></select>
-										<?php
+									<script type="text/javascript">
-										echo "<option value=\"0\"></option>";
+										halloffameOptionenFuellen('verein_id_<?php echo $p; ?>', 'halloffame-vereine-options', '<?php echo $row != null ? (int) $row->$index_vereinid : 0; ?>');
-										foreach ($vereine as $v)
+									</script>
-											echo "<option value=\"" . $v->verein_id . "\"" . ($row != null ? ($row->$index_vereinid == $v->verein_id ? " selected" : "") : "") . ">" . htmlentities_utf8($v->verein) . "</option>";
-										?>
-									</select>
 									<input class="inputbox uk-select" type="text" style="width: 370px; height: 35px;"
 										   name="teamname_<?php echo $p; ?>" id="verein_<?php echo $p; ?>" size="50" maxlength="64"
 										   value="<?php echo $row != null ? htmlentities_utf8($row->$index_team) : ''; ?>"/>
 								</td>
 							</tr>
-							<?php 
+							<tr class="halloffame-platz-zeile">
+								<td nowrap style="width: 20%; text-align: right">
+									<label for="teamspieler_<?php echo $p; ?>"><?php echo Text::_('COM_SPORTSMANAGER_HALL_OF_FAME_TEAM_PLAYERS'); ?>
+										:</label>
+								</td>
+								<td nowrap>
+									<textarea class="uk-textarea" style="width: 740px; height: 70px;"
+											  name="teamspieler_<?php echo $p; ?>" id="teamspieler_<?php echo $p; ?>"
+											  ><?php echo $row != null ? htmlentities_utf8($row->$index_teamspieler) : ''; ?></textarea>
+								</td>
+							</tr>
+							<?php
 						}
-						
+
 						if ($halloffame->spielform == 2 || $halloffame->spielform == 3){
 							$index_spieler1id = "spieler1_id_" . $p;
 							$index_spieler1 = "spieler1_" . $p;
 							$index_spieler2id = "spieler2_id_" . $p;
 							$index_spieler2 = "spieler2_" . $p;
 							?>
-							<tr>
+							<tr class="halloffame-platz-zeile">
 								<td nowrap style="width: 20%; text-align: right">
 									<label for="player1_<?php echo $p; ?>"><?php echo Text::_('COM_SPORTSMANAGER_PLACE') . " " . $p; ?>
 										:</label>
 								</td>
 								<td nowrap>
 									<select class="uk-select uk-form-width-large" name="spieler1_id_<?php echo $p; ?>"
-											id="player1_id_<?php echo $p; ?>" size="1" style="width: 370px;">
+											id="player1_id_<?php echo $p; ?>" size="1" style="width: 370px;"></select>
-										<?php
+									<script type="text/javascript">
-										echo "<option value=\"0\"></option>";
+										halloffameOptionenFuellen('player1_id_<?php echo $p; ?>', 'halloffame-spieler-options', '<?php echo $row != null ? (int) $row->$index_spieler1id : 0; ?>');
-										foreach ($spieler as $s)
+									</script>
-											echo "<option value=\"" . $s->spieler_id . "\"" . ($row != null ? ($row->$index_spieler1id == $s->spieler_id ? " selected" : "") : "") . ">" . htmlentities_utf8($s->spieler) . "</option>";
-										?>
-									</select>
 									<input class="inputbox uk-select" type="text" style="width: 370px; height: 35px;"
 										   name="spieler1_<?php echo $p; ?>" id="player1_<?php echo $p; ?>" size="50" maxlength="64"
 										   value="<?php echo $row != null ? htmlentities_utf8($row->$index_spieler1) : ''; ?>"/>
 								<?PHP if ($halloffame->spielform == 2){ ?>
 									<br>
 									<select class="uk-select uk-form-width-large" name="spieler2_id_<?php echo $p; ?>"
-											id="player2_id_<?php echo $p; ?>" size="1" style="width: 370px;">
+											id="player2_id_<?php echo $p; ?>" size="1" style="width: 370px;"></select>
-										<?php
+									<script type="text/javascript">
-										echo "<option value=\"0\"></option>";
+										halloffameOptionenFuellen('player2_id_<?php echo $p; ?>', 'halloffame-spieler-options', '<?php echo $row != null ? (int) $row->$index_spieler2id : 0; ?>');
-										foreach ($spieler as $s)
+									</script>
-											echo "<option value=\"" . $s->spieler_id . "\"" . ($row != null ? ($row->$index_spieler2id == $s->spieler_id ? " selected" : "") : "") . ">" . htmlentities_utf8($s->spieler) . "</option>";
-										?>
-									</select>
 									<input class="inputbox uk-select" type="text" style="width: 370px; height: 35px;"
 										   name="spieler2_<?php echo $p; ?>" id="player2_<?php echo $p; ?>" size="50" maxlength="64"
 										   value="<?php echo $row != null ? htmlentities_utf8($row->$index_spieler2) : ''; ?>"/>
 								<?PHP } ?>
 								</td>
 							</tr>
-							<?php 
+							<?php
 						}
-					} 
+					}
 					?>
 					<tr>
 						<td nowrap colspan="2">&nbsp;</td>
 					</tr>
 				</table>
-				
+
             </div>
             <input type="submit" name="save" value="<?php echo Text::_('COM_SPORTSMANAGER_SAVE'); ?>" class="button"/>
             <input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_CANCEL'); ?>" class="button"/>
@@ -8376,9 +8522,12 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 			<input type="hidden" name="halloffame_id" value="<?php echo $halloffame->halloffame_id; ?>"/>
 			<input type="hidden" name="spielform" value="<?php echo $halloffame->spielform; ?>"/>
         </form>
+        <script type="text/javascript">
+            halloffameNichtAusgespieltUmschalten(document.getElementById('nicht_ausgespielt').checked);
+        </script>
         <?php
     }
-	
+
     static function adminRegelwerke($rows): void
     {
         global $params;
@@ -9327,7 +9476,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                                             </select>
                                         </td>
                                     </tr>
-									<?php 
+									<?php
 									if (!einstellungswert("ordnungsstrafen_verwenden"))
 										echo "<tr style='display: none;'>";
 									else
@@ -9435,12 +9584,16 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                                                 :</label>
                                         </td>
                                         <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="direktervergleich" id="dd_hthr" size="1">
+                                            <select class="uk-select uk-form-width-large" name="direktervergleich" id="dd_hthr" size="1">
                                                 <?php
-                                                $direktervergleich = array(Text::_('COM_SPORTSMANAGER_NO'), Text::_('COM_SPORTSMANAGER_YES'));
+                                                $typ = array(
-                                                for ($i = 0; $i <= 1; $i++) {
+                                                    0 => Text::_('COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_NOT'),
-                                                    echo "<option value=\"" . $i . "\"" . ($row != null ? ($row->direktervergleich == $i ? " selected" : "") : "") . ">" . htmlentities_utf8($direktervergleich[$i]) . "</option>";
+                                                    1 => Text::_('COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_POINTS'),
-                                                }
+                                                    2 => Text::_('COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_SETS'),
+                                                    3 => Text::_('COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_GOALS')
+                                                );
+                                                foreach ($typ as $typ_wert => $typ_bezeichnung)
+                                                    echo "<option value=\"" . $typ_wert . "\"" . ($row != null ? ($row->direktervergleich == $typ_wert ? " selected" : "") : "") . ">" . htmlentities_utf8($typ_bezeichnung) . "</option>";
                                                 ?>
                                             </select>
                                         </td>
@@ -9662,7 +9815,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 
 			function pruefeAnzeige() {
 				const wert = parseInt(dropdown.value);
-				if (wert >= 1 && wert <= 9) {
+				if (wert >= 1 && wert <= 11) {
 					zeile.style.display = "";
 				} else {
 					zeile.style.display = "none";
@@ -9676,7 +9829,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
         <?php
     }
 
-    static function adminMannschaften($veranstaltung, $rows): void
+    static function adminMannschaften($veranstaltung, $rows, $ansprechpartner): void
     {
         global $params;
 
@@ -9726,6 +9879,8 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                     <th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP'); ?>">
                         <strong><?php echo Text::_('COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS'); ?></strong></th>
                     <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_HOME_VENUE'); ?></strong></th>
+                    <th></th>
+                    <th></th>
                 </tr>
                 <?php
 
@@ -9768,6 +9923,14 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                         </td>
                         <td nowrap align="center"><?php echo $row->anzahl_verschiebungen; ?></td>
                         <td nowrap><?php if (!empty($row->name)) echo htmlentities_utf8($row->name); ?></td>
+						<td>
+						<?PHP
+						if (!empty($ansprechpartner[$row->team_id])){
+							$emails = implode(';', $ansprechpartner[$row->team_id]);
+							echo "<a href='mailto:" . $emails . "?subject=" . $row->teamname . "'>E-Mail</a>&nbsp;";
+						}
+						?>
+						</td>
                         <?php if ($row->begegnungen == 0) { ?>
                             <td nowrap><small><a
                                         href="<?php echo SportsManagerURL('&task=admin_team_remove&veranstaltungid=' . $veranstaltung->veranstaltung_id . '&id=' . $row->team_id); ?>"
@@ -10264,7 +10427,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                     <th nowrap style="text-align: center"><strong><?php echo JText::_('COM_SPORTSMANAGER_PENALTY'); ?></strong></th>
                     <th nowrap style="text-align: left"><strong><?php echo JText::_('COM_SPORTSMANAGER_DESCRIPTION'); ?></strong></th>
                 </tr>
-                
+
                 <?php
                 $k = 0;
                 foreach ($rows as $row) {
@@ -10960,7 +11123,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 			<?php echo Text::_('COM_SPORTSMANAGER_ENCOUNTERS'); ?>
             '<?php echo htmlentities_utf8($veranstaltung->bezeichnung); ?>
             ': <?php echo Text::_('COM_SPORTSMANAGER_JOOMLA_MANAGEMENT'); ?></div>
-		
+
 		<div class="uk-overflow-auto">
         <table style="border-spacing: 10px; width: 100%;">
             <tr>
@@ -11031,10 +11194,10 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 							$Spieltagname = "Runde " . $row->spieltag;
 						else
 							$Spieltagname = "Spieltag " . $row->spieltag;
-						
+
-						if ($row->spieltag < 999 && $veranstaltung->spieltag_titel_zeigen == 1 && $row->spieltag_titel != "") 
+						if ($row->spieltag < 999 && $veranstaltung->spieltag_titel_zeigen == 1 && $row->spieltag_titel != "")
 							$Spieltagname .= " - " . $row->spieltag_titel;
-						
+
 						if ($Spieltagname_Buffer != $Spieltagname){
 						?>
 						<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
@@ -11062,12 +11225,12 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 							<th nowrap><span style="font-size: 70%; "><i>
 								<?php echo htmlentities_utf8($monatsbezeichnung); ?></i></span>
 							</th>
-						</tr> 
+						</tr>
 						<?php
 					}
 					?>
-						
+
-						
+
                     <tr class="sectiontableentry<?php echo $k + 1;
                     $k = ($k + 1) % 2; ?><?php echo $params->get('pageclass_sfx'); ?>">
 
@@ -11287,7 +11450,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                                                    value="<?php if ($row != null) echo htmlentities_utf8($row->spieltag_titel); ?>"/>
 											<datalist id="auswahl_spieltagtitel" >
 											<?php if ($auswahl_spieltagtitel){ ?>
-												<?php foreach($auswahl_spieltagtitel AS $titel){ ?> 
+												<?php foreach($auswahl_spieltagtitel AS $titel){ ?>
 													<option value="<?= htmlspecialchars($titel->spieltag_titel, ENT_QUOTES) ?>"></option>
 												<?php } ?>
 											<?php } ?>
@@ -11306,7 +11469,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 													title="Spielnummer (optional)" name="spiel_nr">
 											<option value=""></option>
                                                 <?php
-                                                for ($i = 1; $i <= 99; $i++) 
+                                                for ($i = 1; $i <= 99; $i++)
 												{
 													echo "<option value=\"" . $i . "\"" . ($spiel_nr == $i ? " selected" : "") . ">" . $i . "</option>";
 												}
@@ -11418,7 +11581,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
             </div>
 
             <input type="submit" name="save" value="<?php echo Text::_('COM_SPORTSMANAGER_SAVE'); ?>" class="button"
-                   onclick="if (document.adminForm.heim_team_id.value === document.adminForm.gast_team_id.value) 
+                   onclick="if (document.adminForm.heim_team_id.value === document.adminForm.gast_team_id.value)
 				   { alert('<?php echo Text::_('COM_SPORTSMANAGER_HOME_VISITING_TEAMS_DIFFERENT'); ?>'); return false; } return true;"/>
             <input type="submit" name="cancel" value="<?php echo Text::_('COM_SPORTSMANAGER_CANCEL'); ?>"
                    class="button"/>
@@ -11785,8 +11948,9 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                                             $spiel_einzel = $spieltypen[$i - 1][0] != "D";
                                             if (($spiel_einzel && $spielpunkte_wertung_einzel == 2) || (!$spiel_einzel && $spielpunkte_wertung_doppel == 2))
                                                 continue;
-                                            echo "  punkte_heim = document.adminForm.spiel_" . $i . "_heim_punkte.value != '' ? document.adminForm.spiel_" . $i . "_heim_punkte.value : 0;\n"
+                                            // Number(): .value ist eine Zeichenkette, "10" > "9" wäre sonst unwahr
-                                                . "  punkte_gast = document.adminForm.spiel_" . $i . "_gast_punkte.value != '' ? document.adminForm.spiel_" . $i . "_gast_punkte.value : 0;\n"
+                                            echo "  punkte_heim = document.adminForm.spiel_" . $i . "_heim_punkte.value != '' ? Number(document.adminForm.spiel_" . $i . "_heim_punkte.value) : 0;\n"
+                                                . "  punkte_gast = document.adminForm.spiel_" . $i . "_gast_punkte.value != '' ? Number(document.adminForm.spiel_" . $i . "_gast_punkte.value) : 0;\n"
                                                 . "  if (punkte_heim > punkte_gast)\n"
                                                 . "    spielpunkte_heim += " . ($spiel_einzel ? "spielpunkte_sieg_einzel" : "spielpunkte_sieg_doppel") . ";\n"
                                                 . "  else if (punkte_heim < punkte_gast)\n"
@@ -12459,7 +12623,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 													   value="<?php if ($row != null) echo htmlentities_utf8($row->spieltag_titel); ?>"/>
 												<datalist id="auswahl_spieltagtitel" >
 												<?php if ($auswahl_spieltagtitel){ ?>
-													<?php foreach($auswahl_spieltagtitel AS $titel){ ?> 
+													<?php foreach($auswahl_spieltagtitel AS $titel){ ?>
 														<option value="<?= htmlspecialchars($titel->spieltag_titel, ENT_QUOTES) ?>"></option>
 													<?php } ?>
 												<?php } ?>
@@ -12475,11 +12639,11 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                                                 <?php if ($teamnr == 1) echo Text::_('COM_SPORTSMANAGER_PAIRINGS') . ":"; ?>
                                             </td>
                                             <td nowrap>
-												<select class="uk-select uk-form-width-xsmall" size="1" id="game_nr" 
+												<select class="uk-select uk-form-width-xsmall" size="1" id="game_nr"
 														name="spiel_nr_<?php echo $teamnr; ?>" title="Spielnummer (optional)">
 												<option value=""></option>
 													<?php
-													for ($i = 1; $i <= 99; $i++) 
+													for ($i = 1; $i <= 99; $i++)
 													{
 														echo "<option value=\"" . $i . "\"" . ($i == $spielnummer ? " selected " : "") . ">" . $i . "</option>";
 													}
@@ -12786,6 +12950,12 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
     {
 		global $params;
 		?>
+        <script type="text/javascript">
+            function anzeige_aktualisieren() {
+                document.getElementById("export_row").style.display = document.adminForm.exportformat.value !== "jsondatei" ? '' : 'none';
+            }
+            window.addEventListener("pageshow", anzeige_aktualisieren);
+        </script>
         <form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
             <div class="uk-overflow-auto">
 				<table style="width: 500px">
@@ -12805,7 +12975,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 							</select>
 						</td>
 					</tr>
-					<tr>
+					<tr id="export_row">
 						<td nowrap style="text-align: right">
 							<label for="export">Exportieren</label>
 						</td>
@@ -12823,8 +12993,9 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 							<label for="exportformat">Exportformat</label>
 						</td>
 						<td nowrap>
-							<select class="uk-select uk-form-width-large" style='width: 320px;' name="exportformat" id="exportformat" size="1">
+							<select class="uk-select uk-form-width-large" style='width: 320px;' name="exportformat" id="exportformat" size="1" onchange="anzeige_aktualisieren();">
 								<option value='csvdatei'>CSV-Datei</option>
+								<option value='jsondatei'>JSON-Datei</option>
 							</select>
 						</td>
 					</tr>
@@ -15392,7 +15563,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								for ($satz = 0; $satz < $saetze_maximal; $satz++) {
 									?>
 									<select class="uk-select uk-form-width-medium"
-											name="ergebnis_punkte_heim[]" 
+											name="ergebnis_punkte_heim[]"
 											size="1" onchange="punkte_changed(<?php echo $satz; ?>, 1);"
 											aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_POINTS_HOME'); ?>">
 										<option value=""></option>

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

@@ -157,6 +157,7 @@ COM_SPORTSMANAGER_DEFEAT="Niederlage"
 COM_SPORTSMANAGER_DEFEATS="Niederlagen"
 COM_SPORTSMANAGER_DEFEATS_SHORTCUT="N"
 COM_SPORTSMANAGER_GOALS="Tore"
+COM_SPORTSMANAGER_GOALS_SHORTCUT="T"
 COM_SPORTSMANAGER_SETS="Sätze"
 COM_SPORTSMANAGER_POINT="Punkt"
 COM_SPORTSMANAGER_POINTS="Punkte"
@@ -169,9 +170,9 @@ COM_SPORTSMANAGER_GAME_POINTS="Spielpunkte"
 COM_SPORTSMANAGER_GAME_POINTS_SHORTCUT="SP"
 COM_SPORTSMANAGER_SUFFIX_ONE_TEAM=" (eine Mannschaft)"
 COM_SPORTSMANAGER_SUFFIX_TEAMS_TOGETHER=" (Mannschaften zusammen)"
-COM_SPORTSMANAGER_DIFFERENCE="Differenz"
+COM_SPORTSMANAGER_DIFFERENCE="Differenz Tore"
-COM_SPORTSMANAGER_DIFFERENCE_IN_POINTS="Punktedifferenz"
+COM_SPORTSMANAGER_DIFFERENCE_IN_POINTS="Differenz Spielpunkte"
-COM_SPORTSMANAGER_POINTS_RATIO="Punkteverhältnis"
+COM_SPORTSMANAGER_POINTS_RATIO="Verhältnis Spielpunkte"
 COM_SPORTSMANAGER_SCHEDULE_DATE="Zeitpunkt"
 COM_SPORTSMANAGER_TEAM_HOME="Heim"
 COM_SPORTSMANAGER_TEAM_VISITOR="Gast"
@@ -296,10 +297,9 @@ COM_SPORTSMANAGER_REQUEST_MESSAGE_PLURAL="Es müssen mindestens %d Termine v
 COM_SPORTSMANAGER_REJECT_SHIFT="Verschiebung ablehnen"
 COM_SPORTSMANAGER_TO="bis"
 COM_SPORTSMANAGER_PLAYER_STATISTICS="Spielerstatistiken"
-COM_SPORTSMANAGER_PERFORMANCE_INDEX_SHORTCUT="LI"
 COM_SPORTSMANAGER_WON="gewonnen"
 COM_SPORTSMANAGER_LOST="verloren"
-COM_SPORTSMANAGER_RATE="Quote"
+COM_SPORTSMANAGER_RATE="Siegquote"
 COM_SPORTSMANAGER_RATE_SHORTCUT="Q"
 COM_SPORTSMANAGER_NO_CLUB="Kein Verein"
 COM_SPORTSMANAGER_RATING="Wertung"
@@ -395,6 +395,8 @@ COM_SPORTSMANAGER_BEATEN="Ausgetreten"
 COM_SPORTSMANAGER_HIDE="Verstecken"
 COM_SPORTSMANAGER_PASSIVE="Passiv"
 COM_SPORTSMANAGER_BEATEN_CLUB="Verein ausgetreten"
+COM_SPORTSMANAGER_ACTIVE_CLUBS="Aktive Vereine"
+COM_SPORTSMANAGER_INACTIVE_CLUBS="Inaktive Vereine"
 COM_SPORTSMANAGER_SINGLE_SEED="Elo-Startwert Einzel"
 COM_SPORTSMANAGER_DOUBLE_SEED="Elo-Startwert Doppel"
 COM_SPORTSMANAGER_PLAYER_EXPORT="Spieler: Exportieren"
@@ -500,6 +502,8 @@ COM_SPORTSMANAGER_WIN_1_POINT="Sieg: 1 Punkt"
 COM_SPORTSMANAGER_WIN_2_POINTS="Sieg: 2 Punkte, Unentschieden: 1 Punkt"
 COM_SPORTSMANAGER_WIN_3_POINTS="Sieg: 3 Punkte, Unentschieden: 1 Punkt"
 COM_SPORTSMANAGER_MEETING_CONCLUDED_AT="Begegnung abgeschlossen bei"
+COM_SPORTSMANAGER_GAMES_IN_STATISTIK="Spiele in Spielerstatistik"
+COM_SPORTSMANAGER_GAMES_IN_STATISTIK_ALL="Alle Spiele"
 COM_SPORTSMANAGER_GENERALLY="Allgemein"
 COM_SPORTSMANAGER_TYPE="Typ"
 COM_SPORTSMANAGER_ELO_MIN="Elo min."
@@ -550,9 +554,22 @@ 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_HEAD_TO_HEAD_OPT_NOT="deaktiviert"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_POINTS="bei gleicher Punktzahl"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_SETS="bei gleicher Punktzahl, Satzpunkte"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_GOALS="bei gleicher Punktzahl, Satzpunkte, Tore"
 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_INDEX0="Spielpunkte gewonnen, Spielpunkte verloren, Punktedifferenz"
+COM_SPORTSMANAGER_PERFORMANCE_INDEX1="Leistungsindex (SP+ * SP+ * 100) / (SP+ + SP-), Spielpunkte gewonnen, ..."
 COM_SPORTSMANAGER_PERFORMANCE_INDEX2="Leistungsindex (S * P+ * 10) / (P+ + P-), Spielpunkte gewonnen, ..."
+COM_SPORTSMANAGER_PERFORMANCE_INDEX3="Race Performance Index (Siege*2 + Unentschieden + Tordifferenz)"
+COM_SPORTSMANAGER_PERFORMANCE_INDEX4="Effizienzindex (T+ / (T+ + T-))"
+COM_SPORTSMANAGER_PERFORMANCE_INDEX5="Punkteschnitt (P+ / Anzahl Sätze)"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT1="LI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT2="LI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT3="RPI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT4="EI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT5="AVG"
 COM_SPORTSMANAGER_INDIVIDUAL_STATISTICS="Einzelstatistik aus allen Spielen"
 COM_SPORTSMANAGER_INDIVIDUAL_STATISTICS_SINGLES="Einzelstatistik aus Einzel-Spielen"
 COM_SPORTSMANAGER_INDIVIDUAL_STATISTICS_DOUBLES="Einzelstatistik aus Doppel-Spielen"
@@ -1072,6 +1089,7 @@ COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="Bei Heimrechttausch gleichen Termin eintr
 COM_SPORTSMANAGER_NOT_VALID_TIME="Ungültige Uhrzeit"
 COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Willst Du diesen Spielverlegung wirklich entfernen?"
 COM_SPORTSMANAGER_REST_DAYS="Ruhetage"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Zusatzinfo"
 COM_SPORTSMANAGER_TRAINING_DAYS="Trainingstage"
 COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Nicht aktualisierte Daten"
 COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"
@@ -1092,10 +1110,18 @@ COM_SPORTSMANAGER_MATCH_TYPE="Spielform"
 COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME_YEAR="Willst Du wirklich dieses Hall of Fame Jahr löschen?"
 COM_SPORTSMANAGER_YEARS="Jahre"
 COM_SPORTSMANAGER_ADD_HALL_OF_FAME_YEAR="Hall of Fame Jahr hinzufügen"
+COM_SPORTSMANAGER_HALL_OF_FAME_TITLE_COUNT="Anzahl"
+COM_SPORTSMANAGER_HALL_OF_FAME_TITLES="Titel"
+COM_SPORTSMANAGER_HALL_OF_FAME_TEAM_PLAYERS="Mannschaftsspieler"
+COM_SPORTSMANAGER_HALL_OF_FAME_NOT_HELD="Nicht ausgespielt"
 COM_SPORTSMANAGER_NO_ENTRY="kein Eintrag"
 COM_SPORTSMANAGER_REALLY_SWAP_MATCH="Willst Du wirklich das Heimrecht tauschen?"
 COM_SPORTSMANAGER_SWAP_MATCH="Heimrechttausch"
 COM_SPORTSMANAGER_REALLY_DELETE_MATCH_REPORT="Der Spielbericht wird zusammen mit allen historischen Einträgen gelöscht. Willst du den Spielbericht wirklich löschen?"
 COM_SPORTSMANAGER_MATCH_REPORT_DELETED="Spielbericht gelöscht"
 COM_SPORTSMANAGER_MATCH_REPORT_WAS_DELETED="Der Spielbericht wurde erfolgreich gelöscht!"
-COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Spielberichtskorrektur"
+COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Spielberichtskorrektur"
+COM_SPORTSMANAGER_MIN_MATCHES="Mindestzahl Spiele"
+COM_SPORTSMANAGER_SELECT_ALL="Alle"
+COM_SPORTSMANAGER_MAIL_SEND_ERROR="Die Benachrichtigungs-E-Mail zum Ergebnis konnte nicht versendet werden."
+COM_SPORTSMANAGER_TERMIN_MAIL_SEND_ERROR="Mindestens eine Benachrichtigungs-E-Mail zum Termin konnte nicht versendet werden."

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

@@ -157,6 +157,7 @@ COM_SPORTSMANAGER_DEFEAT="Defeat"
 COM_SPORTSMANAGER_DEFEATS="Defeats"
 COM_SPORTSMANAGER_DEFEATS_SHORTCUT="F"
 COM_SPORTSMANAGER_GOALS="Goals"
+COM_SPORTSMANAGER_GOALS_SHORTCUT="G"
 COM_SPORTSMANAGER_SETS="Sets"
 COM_SPORTSMANAGER_POINT="Point"
 COM_SPORTSMANAGER_POINTS="Points"
@@ -169,9 +170,9 @@ COM_SPORTSMANAGER_GAME_POINTS="Game points"
 COM_SPORTSMANAGER_GAME_POINTS_SHORTCUT="GP"
 COM_SPORTSMANAGER_SUFFIX_ONE_TEAM=" (one team)"
 COM_SPORTSMANAGER_SUFFIX_TEAMS_TOGETHER=" (teams together)"
-COM_SPORTSMANAGER_DIFFERENCE="Difference"
+COM_SPORTSMANAGER_DIFFERENCE="Goal difference"
-COM_SPORTSMANAGER_DIFFERENCE_IN_POINTS="Difference in points"
+COM_SPORTSMANAGER_DIFFERENCE_IN_POINTS="Difference in game points"
-COM_SPORTSMANAGER_POINTS_RATIO="Points ratio"
+COM_SPORTSMANAGER_POINTS_RATIO="Game points ratio"
 COM_SPORTSMANAGER_SCHEDULE_DATE="Appointment date"
 COM_SPORTSMANAGER_TEAM_HOME="Home"
 COM_SPORTSMANAGER_TEAM_VISITOR="Visitor"
@@ -296,10 +297,9 @@ COM_SPORTSMANAGER_REQUEST_MESSAGE_PLURAL="At least %d dates must be given comple
 COM_SPORTSMANAGER_REJECT_SHIFT="Reject shift"
 COM_SPORTSMANAGER_TO="until"
 COM_SPORTSMANAGER_PLAYER_STATISTICS="Player statistics"
-COM_SPORTSMANAGER_PERFORMANCE_INDEX_SHORTCUT="PI"
 COM_SPORTSMANAGER_WON="won"
 COM_SPORTSMANAGER_LOST="lost"
-COM_SPORTSMANAGER_RATE="Rate"
+COM_SPORTSMANAGER_RATE="Winning rate"
 COM_SPORTSMANAGER_RATE_SHORTCUT="R"
 COM_SPORTSMANAGER_NO_CLUB="No club"
 COM_SPORTSMANAGER_RATING="Rating"
@@ -395,6 +395,8 @@ COM_SPORTSMANAGER_BEATEN="Excreted"
 COM_SPORTSMANAGER_HIDE="Hide"
 COM_SPORTSMANAGER_PASSIVE="Passive"
 COM_SPORTSMANAGER_BEATEN_CLUB="Club excreted"
+COM_SPORTSMANAGER_ACTIVE_CLUBS="Active clubs"
+COM_SPORTSMANAGER_INACTIVE_CLUBS="Inactive clubs"
 COM_SPORTSMANAGER_SINGLE_SEED="Elo starting value singles"
 COM_SPORTSMANAGER_DOUBLE_SEED="Elo starting value doubles"
 COM_SPORTSMANAGER_PLAYER_EXPORT="Players: Export"
@@ -500,6 +502,8 @@ COM_SPORTSMANAGER_WIN_1_POINT="Win: 1 point"
 COM_SPORTSMANAGER_WIN_2_POINTS="Win: 2 points, draw: 1 point"
 COM_SPORTSMANAGER_WIN_3_POINTS="Win: 3 points, draw: 1 point"
 COM_SPORTSMANAGER_MEETING_CONCLUDED_AT="Match won at"
+COM_SPORTSMANAGER_GAMES_IN_STATISTIK="Games in player statistics"
+COM_SPORTSMANAGER_GAMES_IN_STATISTIK_ALL="All games"
 COM_SPORTSMANAGER_GENERALLY="Generally"
 COM_SPORTSMANAGER_TYPE="Type"
 COM_SPORTSMANAGER_ELO_MIN="Elo min."
@@ -550,9 +554,22 @@ 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_HEAD_TO_HEAD_OPT_NOT="Off"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_POINTS="Tie: pts"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_SETS="Tie: pts, set points"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_OPT_GOALS="Tie: pts, set points, goals"
 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_INDEX0="Game points won, game points lost, point difference"
+COM_SPORTSMANAGER_PERFORMANCE_INDEX1="Performance index (GP+ * GP+ * 100) / (GP+ + GP-), game points won, ..."
 COM_SPORTSMANAGER_PERFORMANCE_INDEX2="Performance index (games * P+ * 10) / (P+ + P-), game points won, ..."
+COM_SPORTSMANAGER_PERFORMANCE_INDEX3="Race Performance Index (victories*2 + draws + goal difference)"
+COM_SPORTSMANAGER_PERFORMANCE_INDEX4="Efficency index (G+ / (G+ + G-))"
+COM_SPORTSMANAGER_PERFORMANCE_INDEX5="Set point average (P+ / count sets)"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT1="LI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT2="LI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT3="RPI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT4="EI"
+COM_SPORTSMANAGER_PERFORMANCE_SHORT5="AVG"
 COM_SPORTSMANAGER_INDIVIDUAL_STATISTICS="Individual statistics of all games"
 COM_SPORTSMANAGER_INDIVIDUAL_STATISTICS_SINGLES="Individual statistics of singles games"
 COM_SPORTSMANAGER_INDIVIDUAL_STATISTICS_DOUBLES="Individual statistics of doubles games"
@@ -1072,6 +1089,7 @@ COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="If home advantage is swapped, enter the s
 COM_SPORTSMANAGER_NOT_VALID_TIME="Not valid time"
 COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Do you really want to remove this match rescheduling?"
 COM_SPORTSMANAGER_REST_DAYS="Rest days"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Additional info"
 COM_SPORTSMANAGER_TRAINING_DAYS="Training days"
 COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Data not updated"
 COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"
@@ -1092,10 +1110,18 @@ COM_SPORTSMANAGER_MATCH_TYPE="Game Type"
 COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME_YEAR="Are you sure you want to delete this Hall of Fame year?"
 COM_SPORTSMANAGER_YEARS="Years"
 COM_SPORTSMANAGER_ADD_HALL_OF_FAME_YEAR="Add Hall of Fame Year"
+COM_SPORTSMANAGER_HALL_OF_FAME_TITLE_COUNT="Number"
+COM_SPORTSMANAGER_HALL_OF_FAME_TITLES="Titles"
+COM_SPORTSMANAGER_HALL_OF_FAME_TEAM_PLAYERS="Team Players"
+COM_SPORTSMANAGER_HALL_OF_FAME_NOT_HELD="Not held"
 COM_SPORTSMANAGER_NO_ENTRY="no entry"
 COM_SPORTSMANAGER_REALLY_SWAP_MATCH="Do you really want to swap the home advantage?"
 COM_SPORTSMANAGER_SWAP_MATCH="Swap home advantage"
 COM_SPORTSMANAGER_REALLY_DELETE_MATCH_REPORT="The match report and all its history will be deleted. Are you sure you want to delete the match report?"
 COM_SPORTSMANAGER_MATCH_REPORT_DELETED="Match report deleted"
 COM_SPORTSMANAGER_MATCH_REPORT_WAS_DELETED="The match report has been successfully deleted!"
-COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Match report corrected"
+COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Match report corrected"
+COM_SPORTSMANAGER_MIN_MATCHES="Min count matches"
+COM_SPORTSMANAGER_SELECT_ALL="All"
+COM_SPORTSMANAGER_MAIL_SEND_ERROR="The notification e-mail for the result could not be sent."
+COM_SPORTSMANAGER_TERMIN_MAIL_SEND_ERROR="At least one notification e-mail for the appointment could not be sent."

src/structure/script.php

@@ -94,6 +94,12 @@ return new class () implements InstallerScriptInterface
                 return false;
             }
 
+            if (!bildKopierenAngepasst(JPATH_ROOT.DIRECTORY_SEPARATOR.'components'.DIRECTORY_SEPARATOR.'com_sportsmanager'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'spieler-n.png', JPATH_ROOT.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'sportsmanager'.DIRECTORY_SEPARATOR.'spieler'.DIRECTORY_SEPARATOR.'n.png', 180, 240, 1)) {
+                Log::add('Image /components/com_sportsmanager/images/spieler-n.png could not be copied to /images/sportsmanager/spieler/n.png', Log::ERROR);
+                echo '<p>Fehler: Bild spieler-n.png konnte nicht nach /images/sportsmanager/spieler/n.png verschoben werden</p>';
+                return false;
+            }
+
         }
         $adapter->getParent()->setRedirectURL('index.php?option=com_sportsmanager');
         return true;
@@ -526,6 +532,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `bestenliste_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `spieler_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `spieler_2_id` int(11) DEFAULT NULL,"
+		. "\n  `team_id` INT(11) DEFAULT NULL,"
 		. "\n  `siege` smallint(6) DEFAULT NULL,"
 		. "\n  `unentschieden` smallint(6) DEFAULT NULL,"
 		. "\n  `niederlagen` smallint(6) DEFAULT NULL,"
@@ -673,6 +680,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `telefon` varchar(64) DEFAULT NULL,"
 		. "\n  `email` varchar(64) DEFAULT NULL,"
 		. "\n  `ruhetage` varchar(64) DEFAULT NULL,"
+		. "\n  `zusatzinfo` text DEFAULT NULL,"
 		. "\n  `beschreibung` varchar(500) DEFAULT NULL,"
 		. "\n  `status` tinyint(1) NOT NULL DEFAULT '0',"
 		. "\n  PRIMARY KEY (`spielort_id`)"
@@ -789,6 +797,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `spielpunkte_bedingung` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `spielernamen` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `heimtausch` tinyint(4) NOT NULL DEFAULT '0',"
+		. "\n  `spiele_in_spielerstatistik` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `modus` varchar(200) NOT NULL DEFAULT '',"
 		. "\n  `status` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  PRIMARY KEY (`teamspiel_modus_id`)"
@@ -1147,7 +1156,7 @@ return new class () implements InstallerScriptInterface
 		. "\n ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_verstoesse` ("
 		. "\n `verstoesse_id` int(11) NOT NULL AUTO_INCREMENT,"
 		. "\n `regelwerke_id` int(11) NOT NULL DEFAULT 0,"
@@ -1163,7 +1172,7 @@ return new class () implements InstallerScriptInterface
 		. "\n ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_ordnungsstrafen` ("
 		. "\n `ordnungsstrafen_id` int(11) NOT NULL AUTO_INCREMENT,"
 		. "\n `verstoesse_id` int(11) NOT NULL DEFAULT 0,"
@@ -1181,7 +1190,7 @@ return new class () implements InstallerScriptInterface
 		. "\n ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_email_vorlagen` ("
 		. "\n `email_vorlagen_id` int(11) NOT NULL AUTO_INCREMENT,"
 		. "\n `vorlage` varchar(64) NOT NULL,"
@@ -1210,7 +1219,7 @@ return new class () implements InstallerScriptInterface
 			. "\n ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_mitglied_von_verbandsorgan` ("
 			. "\n `mitglied_von_verbandsorgan_id` int(11) NOT NULL AUTO_INCREMENT,"
 			. "\n `verbandsorgane_id` int(11) DEFAULT NULL,"
@@ -1249,9 +1258,11 @@ return new class () implements InstallerScriptInterface
 		. "\n    `mitglied_halloffame_id` int(11) NOT NULL AUTO_INCREMENT,"
 		. "\n    `halloffame_id` int(11) NOT NULL,"
 		. "\n    `jahr` int(4) DEFAULT NULL,"
+		. "\n    `nicht_ausgespielt` tinyint(1) NOT NULL DEFAULT '0',"
 		. "\n    `platz` int(11) DEFAULT NULL,"
 		. "\n    `verein_id` int(11) DEFAULT NULL,"
 		. "\n    `teamname` varchar(64) DEFAULT NULL,"
+		. "\n    `teamspieler` text DEFAULT NULL,"
 		. "\n    `spieler1_id` int(11) DEFAULT NULL,"
 		. "\n    `spieler1` varchar(64) DEFAULT NULL,"
 		. "\n    `spieler2_id` int(11) DEFAULT NULL,"
@@ -1272,7 +1283,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 = '119';";
+		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '121';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
@@ -1303,11 +1314,11 @@ return new class () implements InstallerScriptInterface
 		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'turnierbaum_zeigen', wert = '0';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'ordnungsstrafen_verwenden', wert = '0';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'spalte_mitglieder_zeigen', wert = '1';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
@@ -1320,7 +1331,7 @@ return new class () implements InstallerScriptInterface
 		. "\n VALUES ('Beliebig', '0', '0', '0', '1', '3', '0');";
 		$db->setQuery($query);
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "INSERT IGNORE INTO `#__sportsmanager_email_vorlagen` (`email_vorlagen_id`, `vorlage`) VALUES (NULL, 'Ordnungsstrafe');";
         $db->setQuery($query);
         if (!$db->execute()) { die($db->stderr(true)); }
@@ -1328,7 +1339,7 @@ return new class () implements InstallerScriptInterface
 		$query = "INSERT IGNORE INTO `#__sportsmanager_email_vorlagen` (`email_vorlagen_id`, `vorlage`) VALUES (NULL, 'Spielverlegung');";
         $db->setQuery($query);
         if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 			$query = "INSERT #__sportsmanager_rangliste_system"
 			. "\n SET systembezeichnung = 'Klostermann/Wahle (1 Punkt für letzten Platz)',"
 			. "\n status = '1',"
@@ -1820,35 +1831,35 @@ return new class () implements InstallerScriptInterface
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_verteiler`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_regelwerke`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_verstoesse`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_ordnungsstrafen`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_email_vorlagen`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_verbandsorgane`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_mitglied_von_verbandsorgan`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_halloffame`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
-		
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_mitglied_von_halloffame`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }