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

stage to prod

.github/workflows/build_release.yml

@@ -98,24 +98,3 @@ jobs:
           else
             echo "No draft releases found"
           fi
-
-      - name: Send notification to Teams
-        run: |
-          curl -H 'Content-Type: application/json' \
-               -d "{
-                     \"@type\": \"MessageCard\",
-                     \"@context\": \"http://schema.org/extensions\",
-                     \"summary\": \"New Release\",
-                     \"themeColor\": \"0076D7\",
-                     \"title\": \"🚀 New Release: ${{ github.ref_name }}\",
-                     \"sections\": [{
-                       \"activityTitle\": \"Repository: ${{ github.repository }}\",
-                       \"text\": \"${{ steps.release_notes_github.outputs.body }}\"
-                     }],
-                     \"potentialAction\": [{
-                       \"@type\": \"OpenUri\",
-                       \"name\": \"View Release\",
-                       \"targets\": [{ \"os\": \"default\", \"uri\": \"https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}\" }]
-                     }]
-                   }" \
-               ${{ secrets.TEAMS_WEBHOOK_URL }}

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

@@ -22,6 +22,8 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CLUBS="Vereine"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_VENUES="Spielorte"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_APPOINTMENTS="Termine"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_MATCH_RESCHEDULING="Spielverlegungen"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_ASSOCIATION_BODIES="Verbandsorgane"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_HALL_OF_FAME="Hall Of Fame"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE="Titel"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE_DESC="Titel, der im Fenster oben angezeigt wird"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION="Beschreibung"

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

@@ -22,6 +22,8 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CLUBS="Clubs"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_VENUES="Venues"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_APPOINTMENTS="Appointments"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_MATCH_RESCHEDULING="Match reschedulings"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_ASSOCIATION_BODIES="Association bodies"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_HALL_OF_FAME="Hall of fame"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE="Title"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE_DESC="Title which will be shows on top"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION="Description"

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

@@ -5503,10 +5503,12 @@ function updateDatabase(): void
         $db->setQuery($query);
         if (!$db->execute()) { die($db->stderr(true)); }
 
-		$query = "ALTER TABLE `#__sportsmanager_veranstaltung` ADD COLUMN IF NOT EXISTS `regelwerke_id` INT(11) NOT NULL DEFAULT '0' AFTER `bezeichnung`;";
+        $columns = $db->getTableColumns('#__sportsmanager_veranstaltung');
-		$db->setQuery($query);
+        if (!array_key_exists('regelwerke_id', $columns)) {
-		if (!$db->execute()) { die($db->stderr(true)); }
+            $query = "ALTER TABLE `#__sportsmanager_veranstaltung` ADD COLUMN `regelwerke_id` INT(11) NOT NULL DEFAULT '0' AFTER `bezeichnung`;";
-
+            $db->setQuery($query);
+            if (!$db->execute()) { die($db->stderr(true)); }
+        }
         $query = "UPDATE #__sportsmanager_einstellungen"
             . "\n SET wert = '114'"
             . "\n WHERE name = 'datenbank_version'";
@@ -5519,13 +5521,18 @@ function updateDatabase(): void
     if ($datenbank_version < 115) {
 
 		// Erweiterung Tabelle #__sportsmanager_verschieberegel
-		$query = "ALTER TABLE `#__sportsmanager_verschieberegel`"
+        $columns = $db->getTableColumns('#__sportsmanager_verschieberegel');
-				."\n ADD COLUMN IF NOT EXISTS `begruendung_erforderlich` INT(1) NOT NULL DEFAULT 0 AFTER `ablehnen`,"
+        if (!array_key_exists('begruendung_erforderlich', $columns)
-				."\n ADD COLUMN IF NOT EXISTS `vereine_berechtigt`       INT(1) NOT NULL DEFAULT 1 AFTER `begruendung_erforderlich`,"
+            || !array_key_exists('vereine_berechtigt', $columns)
-				."\n ADD COLUMN IF NOT EXISTS `verband_berechtigt`       INT(1) NOT NULL DEFAULT 0 AFTER `vereine_berechtigt`;";
+            || !array_key_exists('verband_berechtigt', $columns)) {
-        $db->setQuery($query);
+            $query = "ALTER TABLE `#__sportsmanager_verschieberegel`"
-        if (!$db->execute()) {
+                . "\n ADD COLUMN `begruendung_erforderlich` INT(1) NOT NULL DEFAULT 0 AFTER `ablehnen`,"
-            die($db->stderr(true));
+                . "\n ADD COLUMN `vereine_berechtigt`       INT(1) NOT NULL DEFAULT 1 AFTER `begruendung_erforderlich`,"
+                . "\n ADD COLUMN `verband_berechtigt`       INT(1) NOT NULL DEFAULT 0 AFTER `vereine_berechtigt`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
         }
 
 		$query = "INSERT IGNORE INTO `#__sportsmanager_email_vorlagen` (`email_vorlagen_id`, `vorlage`) VALUES (NULL, 'Spielverlegung');";
@@ -5543,24 +5550,157 @@ function updateDatabase(): void
 
     if ($datenbank_version < 116) {
 
-		$query = "ALTER TABLE `#__sportsmanager_spielort`"
+        $columns = $db->getTableColumns('#__sportsmanager_spielort');
-			. "\n ADD IF NOT EXISTS `telefon` VARCHAR(64) NULL DEFAULT NULL AFTER `url`,"
+        if (!array_key_exists('telefon', $columns)
-			. "\n ADD IF NOT EXISTS `email` VARCHAR(64) NULL DEFAULT NULL AFTER `telefon`,"
+            || !array_key_exists('email', $columns)
-			. "\n ADD IF NOT EXISTS `ruhetage` VARCHAR(64) NULL DEFAULT NULL AFTER `email`;";
+            || !array_key_exists('ruhetage', $columns)) {
+            $query = "ALTER TABLE `#__sportsmanager_spielort`"
+                . "\n ADD `telefon` VARCHAR(64) NULL DEFAULT NULL AFTER `url`,"
+                . "\n ADD `email` VARCHAR(64) NULL DEFAULT NULL AFTER `telefon`,"
+                . "\n ADD `ruhetage` VARCHAR(64) NULL DEFAULT NULL AFTER `email`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+        $columns = $db->getTableColumns('#__sportsmanager_team');
+        if (!array_key_exists('trainingstage', $columns)){
+            $query = "ALTER TABLE `#__sportsmanager_team`"
+                . "\n ADD `trainingstage` VARCHAR(64) NULL DEFAULT NULL AFTER `heimspielort_id`;";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '116'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+
+    if ($datenbank_version < 117) {
+        $query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_team_strafen` ("
+            . "\n  `team_strafen_id` int(11) NOT NULL AUTO_INCREMENT,"
+            . "\n  `zeitpunkt` datetime NOT NULL,"
+            . "\n  `moderator_user_id` int(11) DEFAULT NULL,"
+            . "\n  `team_id` int(11) NOT NULL DEFAULT '0',"
+            . "\n  `strafe` float(6,2) NOT NULL DEFAULT '0',"
+            . "\n  `beschreibung` text NOT NULL,"
+            . "\n  PRIMARY KEY (`team_strafen_id`)"
+            . "\n) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
+        $db->setQuery( $query );
+        if (!$db->execute()) { die($db->stderr(true)); }
+
+        $columns = $db->getTableColumns('#__sportsmanager_veranstaltung');
+        if (!array_key_exists('explizite_strafen', $columns)) {
+            $query = "ALTER TABLE #__sportsmanager_veranstaltung"
+                . "\n ADD explizite_strafen tinyint(4) DEFAULT '0' AFTER elo_wertung";
+            $db->setQuery($query);
+            if (!$db->execute()) {
+                die($db->stderr(true));
+            }
+        }
+
+        $query = "UPDATE #__sportsmanager_einstellungen SET wert = '117' WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) { die($db->stderr(true)); }
+    }
+
+    if ($datenbank_version < 118) {
+
+        $query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_verbandsorgane` ("
+          . "\n `verbandsorgane_id` int(11) NOT NULL AUTO_INCREMENT,"
+          . "\n `veranstalter_id` int(11) DEFAULT NULL,"
+          . "\n `verbandsorgan` varchar(32) DEFAULT NULL,"
+          . "\n `kategorie` int(4) DEFAULT NULL,"
+          . "\n `reihenfolge` int(4) DEFAULT NULL,"
+          . "\n `email` varchar(64) DEFAULT NULL,"
+          . "\n `beschreibung` text NOT NULL,"
+          . "\n PRIMARY KEY (`verbandsorgane_id`),"
+          . "\n KEY (`veranstalter_id`)"
+          . "\n ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
         $db->setQuery($query);
         if (!$db->execute()) {
             die($db->stderr(true));
         }
 
-        $query = "ALTER TABLE `#__sportsmanager_team`"
+        $query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_mitglied_von_verbandsorgan` ("
-			. "\n ADD IF NOT EXISTS `trainingstage` VARCHAR(64) NULL DEFAULT NULL AFTER `heimspielort_id`;";
+          . "\n `mitglied_von_verbandsorgan_id` int(11) NOT NULL AUTO_INCREMENT,"
+          . "\n `verbandsorgane_id` int(11) DEFAULT NULL,"
+          . "\n `funktion` varchar(32) DEFAULT NULL,"
+          . "\n `zusatzinfo` varchar(64) DEFAULT NULL,"
+          . "\n `spieler_id` int(11) DEFAULT NULL,"
+          . "\n `nachname` varchar(32) DEFAULT NULL,"
+          . "\n `vorname` varchar(32) DEFAULT NULL,"
+          . "\n `email` varchar(64) DEFAULT NULL,"
+          . "\n `telefon` varchar(32) DEFAULT NULL,"
+          . "\n `mobil` varchar(32) DEFAULT NULL,"
+          . "\n `reihenfolge` int(11) DEFAULT NULL,"
+          . "\n PRIMARY KEY (`mitglied_von_verbandsorgan_id`),"
+          . "\n KEY (`verbandsorgane_id`),"
+          . "\n KEY (`spieler_id`)"
+          . "\n ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
         $db->setQuery($query);
         if (!$db->execute()) {
             die($db->stderr(true));
         }
 
         $query = "UPDATE #__sportsmanager_einstellungen"
-            . "\n SET wert = '116'"
+            . "\n SET wert = '118'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+		}
+    }
+
+    if ($datenbank_version < 119) {
+
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_halloffame` ("
+		. "\n    `halloffame_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n    `veranstalter_id` int(11) DEFAULT NULL,"
+		. "\n    `halloffame` varchar(64) DEFAULT NULL,"
+		. "\n    `kategorie` int(4) DEFAULT NULL,"
+		. "\n    `spielform` int(11) DEFAULT NULL,"
+		. "\n    `reihenfolge` int(4) DEFAULT NULL,"
+		. "\n    PRIMARY KEY (`halloffame_id`),"
+		. "\n    KEY `veranstalter_id` (`veranstalter_id`)"
+		. "\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_halloffame` ("
+		. "\n    `mitglied_halloffame_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n    `halloffame_id` int(11) NOT NULL,"
+		. "\n    `jahr` int(4) DEFAULT NULL,"
+		. "\n    `platz` int(11) DEFAULT NULL,"
+		. "\n    `verein_id` int(11) DEFAULT NULL,"
+		. "\n    `teamname` varchar(64) DEFAULT NULL,"
+		. "\n    `spieler1_id` int(11) DEFAULT NULL,"
+		. "\n    `spieler1` varchar(64) DEFAULT NULL,"
+		. "\n    `spieler2_id` int(11) DEFAULT NULL,"
+		. "\n    `spieler2` varchar(64) DEFAULT NULL,"
+		. "\n    PRIMARY KEY (`mitglied_halloffame_id`),"
+		. "\n    UNIQUE KEY `halloffame_jahr_platz` (`halloffame_id`,`jahr`,`platz`),"
+		. "\n    KEY `halloffame_id` (`halloffame_id`),"
+		. "\n    KEY `verein_id` (`verein_id`),"
+		. "\n    KEY `spieler1_id` (`spieler1_id`),"
+		. "\n    KEY `spieler2_id` (`spieler2_id`)"
+		. "\n )  ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '119'"
             . "\n WHERE name = 'datenbank_version'";
         $db->setQuery($query);
         if (!$db->execute()) {

src/structure/components/com_sportsmanager/sportsmanager.php

@@ -371,6 +371,57 @@ if ($task == "spielerbild") {
         case 'admin_joomla_mail_senden':
             sendJoomlaMail();
             break;
+        case 'admin_verbandsorgane':
+            adminVerbandsorgane();
+            break;
+        case 'admin_verbandsorgan_edit':
+            adminEditVerbandsorgan();
+            break;
+        case 'admin_verbandsorgan_save':
+            adminSaveVerbandsorgan();
+            break;
+        case 'admin_verbandsorgan_remove':
+            adminRemoveVerbandsorgan();
+            break;
+        case 'admin_verbandsorgane_export':
+            adminExportVerbandsorgane();
+            break;
+        case 'admin_verbandsorgan_mitglieder':
+            adminVerbandsorganMitglieder();
+            break;
+        case 'admin_verbandsorgan_mitglied_edit':
+            adminEditVerbandsorganMitglied();
+            break;
+        case 'admin_verbandsorgan_mitglied_save':
+            adminSaveVerbandsorganMitglied();
+            break;
+        case 'admin_verbandsorgan_mitglied_remove':
+            adminRemoveVerbandsorganMitglied();
+            break;
+        case 'admin_halloffame':
+            adminHalloffame();
+            break;
+        case 'admin_halloffame_edit':
+            adminEditHalloffame();
+            break;
+        case 'admin_halloffame_save':
+            adminSaveHalloffame();
+            break;
+        case 'admin_halloffame_remove':
+            adminRemoveHalloffame();
+            break;
+        case 'admin_halloffame_mitglieder':
+            adminHalloffameMitglieder();
+            break;
+        case 'admin_halloffame_mitglied_edit':
+            adminEditHalloffameMitglied();
+            break;
+        case 'admin_halloffame_mitglied_save':
+            adminSaveHalloffameMitglied();
+            break;
+        case 'admin_halloffame_mitglied_remove':
+            adminRemoveHalloffameMitglied();
+            break;
         case 'admin_regelwerke':
             adminRegelwerke();
             break;
@@ -461,6 +512,12 @@ if ($task == "spielerbild") {
         case 'admin_team_edit':
             adminEditMannschaft();
             break;
+        case 'admin_team_strafen':
+            adminMannschaftStrafen();
+            break;
+        case 'admin_team_add_strafe':
+            adminMannschaftAddStrafe();
+            break;
         case 'admin_team_save':
             adminSaveMannschaft();
 			break;
@@ -1061,6 +1118,24 @@ if ($task == "spielerbild") {
     }
 } else if ($content == 'spielverlegungen') {
     spielverlegungen();
+} else if ($content == 'verbandsorgane') {
+    switch ($task) {
+        case 'verbandsorgane_details':
+            verbandsorganeDetails();
+            break;
+        default:
+            verbandsorgane();
+            break;
+    }
+} else if ($content == 'hall_of_fame') {
+    switch ($task) {
+        case 'hall_of_fame_details':
+            halloffameDetails();
+            break;
+        default:
+            halloffame();
+            break;
+    }
 } else if ($content == 'login') {
     userAuth();
 } else if ($content == 'login_refresh') {
@@ -1757,14 +1832,15 @@ function tabelle($veranstaltung, $spieltag, $alleine_angezeigt, $praesentation =
 
 function getTabelleDirekterVergleich($teams,$veranstaltung,$spieltag)
 {
-
 	$gesamtpunkte = 1000;
 	$anzahlSpiele = 1000;
 	$platz = 0;
 	$punktgleicheMannschaften = [];
 	$korrekturen = [];
+	$bufferplatz = [];
 	
 	foreach($teams AS $team){
+		$bufferplatz[$team->team_id]['platz'] = $team->platz;
 		if (($gesamtpunkte != $team->gesamtpunkte) OR ($anzahlSpiele != $team->anzahl_spiele)){
 			$gesamtpunkte = $team->gesamtpunkte;
 			$anzahlSpiele = $team->anzahl_spiele;
@@ -1776,10 +1852,54 @@ function getTabelleDirekterVergleich($teams,$veranstaltung,$spieltag)
 			$korrekturen[$platz] = $punktgleicheMannschaften[$platz];
 		}
 	}
-
 	if (!empty($korrekturen)){
 		foreach($korrekturen AS $key => $korrektur){
 			$teamsKorrektur = getTabelleSpieltag($veranstaltung,$spieltag,$korrektur,$key-1);
+			foreach($teamsKorrektur AS $teamKorrektur){
+				$teamKorrektur->platz_alt = $bufferplatz[$teamKorrektur->team_id]['platz'];
+			}
+			
+			if ($veranstaltung->tabellenwertung == 1 || $veranstaltung->tabellenwertung == 4 || $veranstaltung->tabellenwertung == 7){
+				usort($teamsKorrektur, fn($a, $b) =>
+					[(float)$b->begegnungspunkte, (int)$a->anzahl_spiele, (float)$b->spielpunkte_differenz, (float)$b->punkte_differenz, (int)$a->platz_alt]
+					<=>
+					[(float)$a->begegnungspunkte, (int)$b->anzahl_spiele, (float)$a->spielpunkte_differenz, (float)$a->punkte_differenz, (int)$b->platz_alt]
+				);
+			}
+			else if ($veranstaltung->tabellenwertung == 2 || $veranstaltung->tabellenwertung == 5 || $veranstaltung->tabellenwertung == 8){
+				usort($teamsKorrektur, fn($a, $b) =>
+					[(float)$b->begegnungspunkte, (int)$a->anzahl_spiele, (float)$b->spielpunkte_quotient, (float)$b->punkte_quotient, (int)$a->platz_alt]
+					<=>
+					[(float)$a->begegnungspunkte, (int)$b->anzahl_spiele, (float)$a->spielpunkte_quotient, (float)$a->punkte_quotient, (int)$b->platz_alt]
+				);
+			}
+			else if ($veranstaltung->tabellenwertung == 10){
+				usort($teamsKorrektur, fn($a, $b) =>
+					[(float)$b->spielpunkte_differenz, (float)$b->punkte_differenz, (int)$a->platz_alt]
+					<=>
+					[(float)$a->spielpunkte_differenz, (float)$a->punkte_differenz, (int)$b->platz_alt]
+				);
+			}
+			else if ($veranstaltung->tabellenwertung == 11){
+				usort($teamsKorrektur, fn($a, $b) =>
+					[(float)$b->spielpunkte_quotient, (float)$b->punkte_quotient, (int)$a->platz_alt]
+					<=>
+					[(float)$a->spielpunkte_quotient, (float)$a->punkte_quotient, (int)$b->platz_alt]
+				);
+			}
+			else {
+				usort($teamsKorrektur, fn($a, $b) =>
+					[(float)$b->begegnungspunkte, (int)$a->anzahl_spiele, (int)$a->platz_alt]
+					<=>
+					[(float)$a->begegnungspunkte, (int)$b->anzahl_spiele, (int)$b->platz_alt]
+				);
+			}
+			
+			$neuerPlatz = $key;
+			foreach ($teamsKorrektur as $teamKorrektur) {
+				$teamKorrektur->platz = $neuerPlatz++;
+			}
+
 			foreach($teamsKorrektur AS $teamKorrektur){
 				foreach($teams AS $team){
 					if ($team->team_id == $teamKorrektur->team_id){
@@ -3103,7 +3223,9 @@ function spielerDetails(): void
     $spieler = $rows[0];
 
     // Aktive Vereinsmitgliedschaften ermitteln
-    $query = "SELECT vereinsname"
+    $query = "SELECT vereinsname,"
+		. "\n CASE #__sportsmanager_mitglied_von_verein.mitgliedsstatus"
+		. "\n WHEN 1 THEN 'Aktiv' WHEN 2 THEN 'Eingeschränkt' END AS status"
         . "\n FROM #__sportsmanager_mitglied_von_verein, #__sportsmanager_verein"
         . "\n LEFT JOIN #__sportsmanager_veranstalter USING (veranstalter_id)"
         . "\n WHERE #__sportsmanager_mitglied_von_verein.spieler_id = $id "
@@ -4216,6 +4338,195 @@ function spielverlegungen(): void
     }
 }
 
+function verbandsorgane(): void
+{
+    $db = getDatabase();
+    global $params;
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+	
+    $query = "SELECT t1.*, COUNT(t2.verbandsorgane_id) AS anzahl, t3.veranstalterbezeichnung AS organisation"
+			. "\n FROM #__sportsmanager_verbandsorgane t1"
+			. "\n LEFT JOIN #__sportsmanager_mitglied_von_verbandsorgan t2 ON t2.verbandsorgane_id = t1.verbandsorgane_id"
+			. "\n LEFT JOIN #__sportsmanager_veranstalter t3 ON t3.veranstalter_id = t1.veranstalter_id"
+			. "\n GROUP BY t1.verbandsorgane_id"
+			. kategorieFilter("HAVING t1.kategorie IN")
+			. "\n ORDER BY t1.reihenfolge;";
+    $verbandsorgane = loadObjectList($db, $query);
+	
+    $query = "SELECT COUNT(veranstalter_id) AS anzahl"
+			. "\n FROM #__sportsmanager_verbandsorgane"
+			. "\n GROUP BY veranstalter_id"
+			. kategorieFilter("WHERE kategorie IN");
+    $organisationen = loadObjectList($db, $query);
+	if (count($organisationen) > 1)
+		$organisation_zeigen = true;
+	else
+		$organisation_zeigen = false;
+
+	if (count($verbandsorgane) == 1){
+		verbandsorganeDetails($verbandsorgane[0]->verbandsorgane_id);
+	} else {
+		if (isJson()) {
+			echo json_encode($verbandsorgane);
+		} else {
+			HTML_sportsmanager::verbandsorgane($params->get('titel'), $params->get('beschreibung'), $verbandsorgane, $organisation_zeigen);
+		}
+	}
+}
+
+function verbandsorganeDetails($uebergabe_id = 0): void
+{
+    $db = getDatabase();
+    $app = Factory::getContainer()->get(SiteApplication::class);
+    $jInput = $app->input;
+	
+    global $params;
+	
+	
+	$user_id = isExternalDatabase() ? 0 : (isJson() ? getUserID() : $app->getIdentity()->id);
+	if ($user_id > 0)
+		$erweiterte_anzeige = true;
+	else
+		$erweiterte_anzeige = false;
+	
+	if ($uebergabe_id == 0)
+		$id = $jInput->get('id', 0, 'INT');
+	else
+		$id = $uebergabe_id;
+
+	$query = "SELECT * FROM #__sportsmanager_verbandsorgane WHERE verbandsorgane_id = $id";
+    $rows = loadObjectList($db, $query);
+    if (count($rows) < 1) {
+        abortWithError("Wrong id!");
+    }
+    $verbandsorgan = $rows[0];
+
+	$query = "SELECT * FROM #__sportsmanager_mitglied_von_verbandsorgan"
+		. "\n WHERE verbandsorgane_id = $id"
+		. "\n ORDER BY reihenfolge, nachname, vorname";
+	$mitglieder = loadObjectList($db, $query);
+	
+	$query = "SELECT zusatzinfo FROM #__sportsmanager_mitglied_von_verbandsorgan"
+		. "\n WHERE verbandsorgane_id = $id"
+		. "\n AND zusatzinfo IS NOT NULL AND TRIM(zusatzinfo) <> ''"
+		. "\n ORDER BY reihenfolge, nachname, vorname";
+	$zusatzinfos = loadObjectList($db, $query);
+	if (count($zusatzinfos) > 0)
+		$zusatzinfos_vorhanden = true;
+	else
+		$zusatzinfos_vorhanden = false;
+	
+    if (isJson()) {
+        echo json_encode($mitglieder);
+    } else {
+        HTML_sportsmanager::verbandsorganeDetails($params->get('titel'), $params->get('beschreibung'), $verbandsorgan, $mitglieder, $erweiterte_anzeige, $zusatzinfos_vorhanden);
+    }
+}
+
+function halloffame(): void
+{
+    $db = getDatabase();
+    global $params;
+	
+    $query = "SELECT t1.*, COUNT(DISTINCT t2.jahr) AS anzahl,"
+			. "\n IF (COUNT(DISTINCT t2.jahr) > 0, CONCAT(min(t2.jahr), ' - ', max(t2.jahr)), '" . Text::_('COM_SPORTSMANAGER_NO_ENTRY') . "') AS zeitspanne"
+			. "\n FROM #__sportsmanager_halloffame t1"
+			. "\n LEFT JOIN #__sportsmanager_mitglied_von_halloffame t2 ON t2.halloffame_id = t1.halloffame_id"
+			. "\n GROUP BY t1.halloffame_id"
+			. kategorieFilter("HAVING t1.kategorie IN")
+			. "\n ORDER BY t1.reihenfolge;";
+    $halloffame = loadObjectList($db, $query);
+	
+	if (count($halloffame) == 1){
+		halloffameDetails($halloffame[0]->halloffame_id);
+	} else {
+		if (isJson()) {
+			echo json_encode($halloffame);
+		} else {
+			HTML_sportsmanager::halloffame($params->get('titel'), $params->get('beschreibung'), $halloffame);
+		}
+	}
+}
+
+function halloffameDetails($uebergabe_id = 0): void
+{
+    $db = getDatabase();
+    $app = Factory::getContainer()->get(SiteApplication::class);
+    $jInput = $app->input;
+	
+    global $params;
+	
+	if ($uebergabe_id == 0)
+		$id = $jInput->get('id', 0, 'INT');
+	else
+		$id = $uebergabe_id;
+	
+	$mitglieder = null;
+	
+	$query = "SELECT * FROM #__sportsmanager_halloffame WHERE halloffame_id = $id";
+	$rows = loadObjectList($db, $query);
+	if (count($rows) < 1) {
+		abortWithError("Wrong id!");
+	}
+	$halloffame = $rows[0];
+	$halloffame->platz2_zeigen = 0;
+	$halloffame->platz3_zeigen = 0;
+	
+    $query = "SELECT t2.*, t1.halloffame"
+		. "\n FROM #__sportsmanager_halloffame t1"
+		. "\n LEFT JOIN #__sportsmanager_mitglied_von_halloffame t2 ON t2.halloffame_id = t1.halloffame_id"
+		. "\n WHERE t2.halloffame_id = $id"
+		. "\n ORDER BY t2.jahr DESC, platz ASC;";
+    $rows = loadObjectList($db, $query);
+	
+	if (count($rows) > 0){
+		$mitglieder = [];
+		if ($halloffame->spielform == 1){
+			foreach ($rows as $row) {
+				$index_vereinid = "verein_id_" . $row->platz;
+				$index_team = "teamname_" . $row->platz;
+				if (!isset($mitglieder[$row->jahr])) {
+					$mitglieder[$row->jahr] = new stdClass();
+				}
+				$mitglieder[$row->jahr]->jahr = $row->jahr;
+				$mitglieder[$row->jahr]->$index_vereinid = $row->verein_id;
+				$mitglieder[$row->jahr]->$index_team = $row->teamname;
+				if ($row->platz == 2 && !empty($row->teamname))
+					$halloffame->platz2_zeigen = 1;
+				if ($row->platz == 3 && !empty($row->teamname))
+					$halloffame->platz3_zeigen = 1;
+			}
+		}
+		if ($halloffame->spielform == 2 || $halloffame->spielform == 3){
+			foreach ($rows as $row) {
+				$index_spieler1id = "spieler1_id_" . $row->platz;
+				$index_spieler1 = "spieler1_" . $row->platz;
+				$index_spieler2id = "spieler2_id_" . $row->platz;
+				$index_spieler2 = "spieler2_" . $row->platz;
+				
+				if (!isset($mitglieder[$row->jahr])) {
+					$mitglieder[$row->jahr] = new stdClass();
+				}
+				$mitglieder[$row->jahr]->jahr = $row->jahr;
+				$mitglieder[$row->jahr]->$index_spieler1id = $row->spieler1_id;
+				$mitglieder[$row->jahr]->$index_spieler1 = $row->spieler1;
+				$mitglieder[$row->jahr]->$index_spieler2id = $row->spieler2_id;
+				$mitglieder[$row->jahr]->$index_spieler2 = $row->spieler2;
+				if ($row->platz == 2 && (!empty($row->spieler1) || !empty($row->spieler2)))
+					$halloffame->platz2_zeigen = 1;
+				if ($row->platz == 3 && (!empty($row->spieler1) || !empty($row->spieler2)))
+					$halloffame->platz3_zeigen = 1;
+			}
+		}
+	}
+	
+    if (isJson()) {
+        echo json_encode($mitglieder);
+    } else {
+        HTML_sportsmanager::halloffameDetails($params->get('titel'), $params->get('beschreibung'), $mitglieder, $halloffame);
+    }
+}
+
 function begegnungSpielplan($teamansicht = false): void
 {
     $db = getDatabase();
@@ -4774,6 +5085,54 @@ function begegnungVerlegen(): void
     }
 }
 
+function neueTeamStrafe($teamid, $veranstaltungid, $strafe, $moderator_user_id, $beschreibung) {
+    $app = Factory::getContainer()->get(SiteApplication::class);
+    $db = getDatabase();
+    
+    $zeitpunkt = date('Y-m-d H:i:s');
+    $query = "INSERT INTO #__sportsmanager_team_strafen"
+        . "\n (team_id, zeitpunkt, moderator_user_id, strafe, beschreibung)"
+        . "\n VALUES ($teamid, '$zeitpunkt', $moderator_user_id, $strafe, '$beschreibung')";
+    $db->setQuery($query);
+    if (!$result = $db->execute()) { die($db->stderr(true)); }
+
+    $query = "UPDATE #__sportsmanager_team"
+        . "\n SET zusatzpunkte = ("
+        . "\n   SELECT SUM(#__sportsmanager_team_strafen.strafe)"
+        . "\n   FROM #__sportsmanager_team_strafen"
+        . "\n   WHERE #__sportsmanager_team_strafen.team_id = $teamid"
+        . "\n ) WHERE #__sportsmanager_team.team_id = $teamid";
+    $db->setQuery($query);
+    if (!$result = $db->execute()) { die($db->stderr(true)); }
+
+    teamstatistikAktualisieren($veranstaltungid);
+
+    $query = "SELECT teamname FROM #__sportsmanager_team WHERE team_id = $teamid";
+    $teamname = loadResult($db, $query);
+
+    $mailfrom = $app->getCfg('mailfrom');
+    $fromname = $app->getCfg('fromname');
+    $penaltycc = $app->getCfg('penaltycc');
+    $subject = JText::sprintf('COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_SUBJECT', $teamname);
+    $body = JText::sprintf('COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_BODY', $teamname, $strafe, $beschreibung);
+
+    $query = "SELECT t1.email FROM #__users AS t1, #__sportsmanager_berechtigt_fuer_team AS t2 WHERE t1.id = t2.berechtigt_user_id AND t2.berechtigt_team_id = $teamid";
+    $rows = loadObjectList($db, $query);
+    if(!empty($rows)) {
+        $mailer = Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
+        $mailer->setSender($mailfrom, $fromname);
+        if (!empty($penaltycc)) {
+            $mailer->addCc($penaltycc);
+        }
+        $mailer->setSubject($subject);
+        $mailer->setBody($body);
+        foreach ($rows as $row) {
+            $mailer->addBcc($row->email);
+        }
+        $mailer->send();
+    }
+}
+
 function teamstatistikAktualisieren($geaenderte_veranstaltung_id = 0, $geaenderter_teamspiel_modus_id = 0): void
 {
     $db = getDatabase();
@@ -5714,6 +6073,56 @@ function spielerstatistikAktualisieren($geaenderte_spielerstatistik_id = 0, $gea
     }
 }
 
+function halloffameAktualisieren(): void
+{
+	//Beim Löschen von Spieler bzw. Vereine werden die entsprechenden ids in Hall of Fame und Verbandsorgane gelöscht
+	$db = getDatabase();
+
+	// spieler1_id prüfen
+	$query = "UPDATE #__sportsmanager_mitglied_von_halloffame h"
+		. "\n LEFT JOIN #__sportsmanager_spieler s ON s.spieler_id = h.spieler1_id"
+		. "\n SET h.spieler1_id = NULL"
+		. "\n WHERE h.spieler1_id IS NOT NULL"
+		. "\n AND s.spieler_id IS NULL;";
+	$db->setQuery($query);
+	if (!$db->execute()) {
+		die($db->stderr(true));
+	}
+
+	// spieler2_id prüfen
+	$query = "UPDATE #__sportsmanager_mitglied_von_halloffame h"
+		. "\n LEFT JOIN #__sportsmanager_spieler s ON s.spieler_id = h.spieler2_id"
+		. "\n SET h.spieler2_id = NULL"
+		. "\n WHERE h.spieler2_id IS NOT NULL"
+		. "\n AND s.spieler_id IS NULL;";
+	$db->setQuery($query);
+	if (!$db->execute()) {
+		die($db->stderr(true));
+	}
+
+	// verein_id prüfen
+	$query = "UPDATE #__sportsmanager_mitglied_von_halloffame h"
+		. "\n LEFT JOIN #__sportsmanager_verein v ON v.verein_id = h.verein_id"
+		. "\n SET h.verein_id = NULL"
+		. "\n WHERE h.verein_id IS NOT NULL"
+		. "\n AND v.verein_id IS NULL;";
+	$db->setQuery($query);
+	if (!$db->execute()) {
+		die($db->stderr(true));
+	}
+
+	// Verbandsorgan-Spieler prüfen
+	$query = "UPDATE #__sportsmanager_mitglied_von_verbandsorgan h"
+		. "\n LEFT JOIN #__sportsmanager_spieler s ON s.spieler_id = h.spieler_id"
+		. "\n SET h.spieler_id = NULL"
+		. "\n WHERE h.spieler_id IS NOT NULL"
+		. "\n AND s.spieler_id IS NULL;";
+	$db->setQuery($query);
+	if (!$db->execute()) {
+		die($db->stderr(true));
+	}
+}
+
 function wannGespieltAktualisieren(): void
 {
     $db = getDatabase();

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

@@ -25,6 +25,8 @@
       <option value="spielorte"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_VENUES]]></option>
       <option value="termine"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_APPOINTMENTS]]></option>
 	  <option value="spielverlegungen"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_MATCH_RESCHEDULING]]></option>
+	  <option value="verbandsorgane"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_ASSOCIATION_BODIES]]></option>
+	  <option value="hall_of_fame"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_HALL_OF_FAME]]></option>
       </field>
       <field name="titel"
             type="text"

src/structure/components/com_sportsmanager/views/sportsmanager/view.html.php

@@ -1709,7 +1709,7 @@ static function tabelleAnzeigen($veranstaltung, $modus, $teams, $spieltag, $spie
 								<select
 									aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_MATCHDAY_SELECT'); ?>"
 									class="uk-select uk-form-width-medium" name="spieltag" size="1"
-									onChange="document.adminForm.submit();">
+									onChange="this.form.submit();">
 									<?php
 									foreach ($spieltage as $s) {
 										echo "<option value=\"" . $s->spieltag . "\"" . ($s->spieltag == $spieltag ? " selected" : "") . ">" . htmlentities_utf8(Rundenbezeichnung($s->spieltag, $veranstaltung->unterteilung == 0)) . "</option>";
@@ -3951,13 +3951,14 @@ static function spielverlegungen($titel, $beschreibung, $rows): void
 	}
 	?>
 	<div class="uk-overflow-auto">
-		<table class="uk-table-shrink contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>"  style='width: 1000px;'>
+	<table style='border-collapse: collapse;'
+	class="uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
 		<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
-			<th nowrap style='text-align: center; width: 180px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_COMPETITION'); ?></STRONG></th>
+			<th nowrap style='text-align: center; width: 200px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_COMPETITION'); ?></STRONG></th>
-			<th nowrap style='text-align: center; width: 200px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_MATCH'); ?></STRONG></th>
+			<th nowrap style='text-align: center; width: 300px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_MATCH'); ?></STRONG></th>
-			<th nowrap style='text-align: center; width: 150px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_OLD_DATE'); ?></STRONG></th>
+			<th nowrap style='text-align: center; width: 160px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_OLD_DATE'); ?></STRONG></th>
-			<th nowrap style='text-align: center; width: 150px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_NEW_DATE'); ?></STRONG></th>
+			<th nowrap style='text-align: center; width: 160px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_NEW_DATE'); ?></STRONG></th>
-			<th nowrap style='text-align: left; width: 280px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_COMMENT'); ?></STRONG></th>
+			<th nowrap style='text-align: left; width: 300px;'><STRONG><?php echo Text::_('COM_SPORTSMANAGER_COMMENT'); ?></STRONG></th>
 		</tr>
 	<?php
 	if (count($rows) > 0) {
@@ -3983,10 +3984,10 @@ static function spielverlegungen($titel, $beschreibung, $rows): void
 					?>
 				</td>
 				<td nowrap style='text-align: center;'>
-					<?php echo str_replace(" ", "<br>", date('d.m.Y h:i', strtotime($row->Termin_alt))); ?>
+					<?php echo str_replace(" ", "<br>", date('d.m.Y H:i', strtotime($row->Termin_alt))); ?>
 				</td>
 				<td nowrap style='text-align: center;'>
-					<?php echo $row->Termin_neu == "" ? "" : str_replace(" ", "<br>", date('d.m.Y h:i', strtotime($row->Termin_neu))); ?>
+					<?php echo $row->Termin_neu == "" ? "" : str_replace(" ", "<br>", date('d.m.Y H:i', strtotime($row->Termin_neu))); ?>
 				</td>
 				<td nowrap style='text-align: left;'>
 					<?php echo htmlentities_utf8($row->Begruendung_beantragt); ?>
@@ -4001,6 +4002,335 @@ static function spielverlegungen($titel, $beschreibung, $rows): void
 	<?php
 }
 
+static function verbandsorgane($titel, $beschreibung, $rows, $organisation_zeigen): void
+{
+	global $params;
+	if (!empty($titel)) { ?>
+		<style>td{padding: 3px;}</style>
+		<div
+		class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo htmlentities_utf8($titel); ?></div><?php }
+	if (!empty($beschreibung)) {
+		?>
+		<div class="uk-overflow-auto">
+			<table class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+				<tr>
+					<td><?php echo str_contains($beschreibung, ">") ? $beschreibung : htmlentities_utf8($beschreibung); ?></td>
+				</tr>
+			</table>
+		</div>
+		<?php
+	}
+	
+	if (count($rows) > 0) {
+		?>
+		<div class="uk-overflow-auto">
+		<table style='border-collapse: collapse;'
+		class="uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+			<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
+				<th style='text-align: left; width: 250px;' nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_ASSOCIATION_BODIES'); ?></strong></th>
+				<th style='text-align: left; width: 100px;' nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_MEMBERS'); ?></strong></th>
+				<th style='text-align: left; width: 250px;' nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_EMAIL'); ?></strong></th>
+				<?PHP if ($organisation_zeigen){ ?>
+				<th style='text-align: left; width: 150px;' nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_ORGANISATION'); ?></strong></th>
+				<?PHP } ?>
+			</tr>
+			<?php
+
+			$k = 0;
+			foreach ($rows as $row) {
+				?>
+				<tr class="sectiontableentry<?php echo $k + 1;
+				$k = ($k + 1) % 2; ?><?php echo $params->get('pageclass_sfx'); ?>">
+					<td nowrap>
+						<a href="<?php echo SportsManagerURL('&task=verbandsorgane_details&id=' . $row->verbandsorgane_id); ?>">
+						<?php echo htmlentities_utf8(NichtLeererString($row->verbandsorgan)); ?>
+						</a>
+					</td>
+					<td nowrap>
+						<?php echo $row->anzahl; ?>
+					</td>
+					<td nowrap>
+						<?php echo $row->email; ?>
+					</td>
+					<?PHP if ($organisation_zeigen){ ?>
+					<td nowrap>
+						<?php echo $row->organisation; ?>
+					</td>
+					<?PHP } ?>
+				</tr>
+				<?php
+			}
+			?>
+		</table>
+		</div>
+		<?php
+	}	
+	
+	?>
+	<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>">&nbsp;</span>
+	<?php
+}
+
+static function verbandsorganeDetails($titel, $beschreibung, $verbandsorgan, $rows, $erweiterte_anzeige, $zusatzinfos_vorhanden): void
+{
+	global $params;
+	if (!empty($titel)) { ?>
+		<style>td{padding: 3px;}</style>
+		<div
+		class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo htmlentities_utf8($titel); ?></div><?php }
+	if (!empty($beschreibung)) {
+		?>
+		<div class="uk-overflow-auto">
+			<table class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+				<tr>
+					<td><?php echo str_contains($beschreibung, ">") ? $beschreibung : htmlentities_utf8($beschreibung); ?></td>
+				</tr>
+			</table>
+		</div>
+		<?php
+	}
+
+	echo "<div class='uk-overflow-auto'>";
+	echo "<H1>" . $verbandsorgan->verbandsorgan . "</H1>";
+	
+	echo $verbandsorgan->beschreibung;
+	
+	if (count($rows) > 0) {
+		?>
+		<h2><?php echo Text::_('COM_SPORTSMANAGER_MEMBERS'); ?></h2>
+		<table style='border-collapse: collapse;'
+		class="uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+			<?php
+
+			$k = 0;
+			foreach ($rows as $row) {
+				?>
+				<tr class="sectiontableentry<?php echo $k + 1;
+				$k = ($k + 1) % 2; ?><?php echo $params->get('pageclass_sfx'); ?>">
+					<td style='width: 80px;' nowrap>
+						<?PHP echo bildHTML("spieler", $row->spieler_id, 45, 60, 0, 0, 'border="1"'); ?>
+					</td>
+					<td style='width: 200px;' nowrap>
+						<?php echo htmlentities_utf8($row->nachname . ", " . $row->vorname); ?>
+					</td>
+					<?PHP if ($erweiterte_anzeige){ ?>
+					<td style='width: 300px;' nowrap>
+						<?php echo htmlentities_utf8($row->email); ?>
+					</td>
+					<td style='width: 300px;' nowrap>
+						<?php echo htmlentities_utf8($row->telefon); ?>
+					<?PHP if ($row->telefon && $row->mobil){ echo "<br>"; }?>
+						<?php echo htmlentities_utf8($row->mobil); ?>
+					</td>
+					<?PHP } ?>
+					<td style='width: 200px;' nowrap>
+						<?php echo htmlentities_utf8($row->funktion); ?>
+					</td>
+					<?PHP if ($zusatzinfos_vorhanden){ ?>
+					<td style='width: 200px;' nowrap>
+						<?php echo htmlentities_utf8($row->zusatzinfo); ?>
+					</td>
+					<?PHP } ?>
+				</tr>
+				<?php
+			}
+			?>
+		</table>
+		<?php
+	}
+	?>
+	</div>
+	<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>">&nbsp;</span>
+	<?php
+}
+
+static function halloffame($titel, $beschreibung, $rows): void
+{
+	global $params;
+	if (!empty($titel)) { ?>
+		<style>td{padding: 3px;}</style>
+		<div
+		class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo htmlentities_utf8($titel); ?></div><?php }
+	if (!empty($beschreibung)) {
+		?>
+		<div class="uk-overflow-auto">
+			<table class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+				<tr>
+					<td><?php echo str_contains($beschreibung, ">") ? $beschreibung : htmlentities_utf8($beschreibung); ?></td>
+				</tr>
+			</table>
+		</div>
+		<?php
+	}
+
+	if (count($rows) > 0) {
+		?>
+		<div class="uk-overflow-auto">
+		<table style='border-collapse: collapse;'
+		class="uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+			<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
+				<th style='text-align: left; width: 400px;' nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_HALL_OF_FAME'); ?></strong></th>
+				<th style='text-align: center; width: 200px;' nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_YEARS'); ?></strong></th>
+			</tr>
+			<?php
+
+			$k = 0;
+			foreach ($rows as $row) {
+				?>
+				<tr class="sectiontableentry<?php echo $k + 1;
+				$k = ($k + 1) % 2; ?><?php echo $params->get('pageclass_sfx'); ?>">
+					<td nowrap>
+						<a href="<?php echo SportsManagerURL('&task=hall_of_fame_details&id=' . $row->halloffame_id); ?>">
+						<?php echo htmlentities_utf8(NichtLeererString($row->halloffame)); ?>
+						</a>
+					</td>
+					<td style='text-align: center;' nowrap>
+						<?php echo $row->zeitspanne; ?>
+					</td>
+				</tr>
+				<?php
+			}
+			?>
+		</table>
+		</div>
+		<?php
+	}
+	?>
+	<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>">&nbsp;</span>
+	<?php
+}
+
+static function halloffameDetails($titel, $beschreibung, $rows, $halloffame): void
+{
+	global $params;
+	if (!empty($titel)) { ?>
+		<style>td{padding: 3px;}</style>
+		<div
+		class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo htmlentities_utf8($titel); ?></div><?php }
+	if (!empty($beschreibung)) {
+		?>
+		<div class="uk-overflow-auto">
+			<table class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+				<tr>
+					<td><?php echo str_contains($beschreibung, ">") ? $beschreibung : htmlentities_utf8($beschreibung); ?></td>
+				</tr>
+			</table>
+		</div>
+		<?php
+	}
+
+	echo "<H3>" . htmlentities_utf8($halloffame->halloffame) . "</H3>";
+
+	if ($rows != null) {
+	?>
+	<div class="uk-overflow-auto">
+	<table style='border-collapse: collapse;'
+	class="uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
+
+		<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
+			<th style="text-align:center; width:100px;" nowrap>
+				<strong><?php echo Text::_('COM_SPORTSMANAGER_YEAR'); ?></strong>
+			</th>
+
+			<?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>
+					<strong><?php echo Text::_('COM_SPORTSMANAGER_PLACE') . " " . $i; ?></strong>
+				</th>
+			<?php } ?>
+		</tr>
+
+		<?php
+		$k = 0;
+
+		foreach ($rows as $row) {
+			$rowclass = "sectiontableentry" . ($k + 1) . $params->get('pageclass_sfx');
+			$k = ($k + 1) % 2;
+
+			if ($halloffame->spielform == 2) {
+		?>
+			<!-- Erste Zeile -->
+			<tr class="<?php echo $rowclass; ?>">
+
+				<td rowspan="2" nowrap style="text-align:center;">
+					<?php echo $row->jahr; ?>
+				</td>
+
+				<?php for ($i = 1; $i <= 3; $i++) {
+					if ($i == 2 && !$halloffame->platz2_zeigen) continue;
+					if ($i == 3 && !$halloffame->platz3_zeigen) continue;
+					$spieler1_id = "spieler1_id_" . $i;
+					$spieler1    = "spieler1_" . $i;
+				?>
+					<td nowrap style="text-align:center; width:70px;">
+						<?php echo bildHTML("spieler", $row->$spieler1_id, 45, 60, 0, 0, 'border="0"'); ?>
+					</td>
+					<td nowrap style="text-align:left; width:300px;">
+						<?php echo htmlentities_utf8($row->$spieler1); ?>
+					</td>
+				<?php } ?>
+			</tr>
+			<!-- Zweite Zeile -->
+			<tr class="<?php echo $rowclass; ?>">
+				<?php for ($i = 1; $i <= 3; $i++) {
+					if ($i == 2 && !$halloffame->platz2_zeigen) continue;
+					if ($i == 3 && !$halloffame->platz3_zeigen) continue;
+					$spieler2_id = "spieler2_id_" . $i;
+					$spieler2    = "spieler2_" . $i;
+				?>
+					<td nowrap style="text-align:center; width:70px;">
+						<?php echo bildHTML("spieler", $row->$spieler2_id, 45, 60, 0, 0, 'border="0"'); ?>
+					</td>
+					<td nowrap style="text-align:left; width:300px;">
+						<?php echo htmlentities_utf8($row->$spieler2); ?>
+					</td>
+				<?php } ?>
+			</tr>
+			<?php
+			} else {
+			?>
+
+			<tr class="<?php echo $rowclass; ?>">
+				<td nowrap style="text-align:center;">
+					<?php echo $row->jahr; ?>
+				</td>
+				<?php for ($i = 1; $i <= 3; $i++) {
+					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;
+						$type = "vereine";
+					} else {
+						$id  = "spieler1_id_" . $i;
+						$txt = "spieler1_" . $i;
+						$type = "spieler";
+					}
+				?>
+					<td nowrap style="text-align:center; width:70px;">
+						<?php echo bildHTML($type, $row->$id, 45, 60, 0, 0, 'border="0"'); ?>
+					</td>
+					<td nowrap style="text-align:left; width:300px;">
+						<?php echo htmlentities_utf8($row->$txt); ?>
+					</td>
+				<?php } ?>
+			</tr>
+			<?php
+			}
+		}
+		?>
+	</table>
+	<?php
+	}
+	?>
+	</div>
+	<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>">&nbsp;</span>
+	<?php
+}
+
 static function spieler($beschreibung, $rows, $sortierung, $statistik, $beginn, $kategorie, $filter, $veranstaltungid, $einstufungid, $veranstaltungen, $veranstalterid, $veranstalter, $einstufungen, $details_anzeigen): void
 {
 	global $params;
@@ -4538,7 +4868,7 @@ if ($bild != null) {
 					<td nowrap style="text-align: right">
 						<?php 
 						foreach ($vereine as $verein)
-							echo htmlentities_utf8($verein->vereinsname) . "<br />";
+							echo htmlentities_utf8($verein->vereinsname) . " (" . htmlentities_utf8($verein->status) . ")<br />";
 						?>
 					</td>
 				</tr>
@@ -5875,10 +6205,6 @@ static function spielerstatistik($spielerstatistik, $spielerstatistik_punkte, $a
 						<?php echo Text::_('COM_SPORTSMANAGER_LOST'); ?>">
 						<strong><?php echo Text::_('COM_SPORTSMANAGER_GAME_POINTS_SHORTCUT'); ?>
 							-</strong></th>
-					<th nowrap
-						title="<?php echo Text::_('COM_SPORTSMANAGER_GAME_POINTS'); ?>
-						<?php echo Text::_('COM_SPORTSMANAGER_RATE'); ?>">
-						<strong><?php echo Text::_('COM_SPORTSMANAGER_RATE_SHORTCUT'); ?></strong></th>
 					<th nowrap
 						title="<?php echo Text::_('COM_SPORTSMANAGER_POINTS'); ?>
 						<?php echo Text::_('COM_SPORTSMANAGER_WON'); ?>">
@@ -5889,6 +6215,10 @@ static function spielerstatistik($spielerstatistik, $spielerstatistik_punkte, $a
 						<?php echo Text::_('COM_SPORTSMANAGER_LOST'); ?>">
 						<strong><?php echo Text::_('COM_SPORTSMANAGER_POINTS_SHORTCUT'); ?> -</strong>
 					</th>
+					<th nowrap
+						title="<?php echo Text::_('COM_SPORTSMANAGER_RATE'); ?>">
+						<strong><?php echo Text::_('COM_SPORTSMANAGER_RATE_SHORTCUT'); ?></strong>
+					</th>
 					<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_VICTORIES'); ?>">
 						<strong><?php echo Text::_('COM_SPORTSMANAGER_VICTORIES_SHORTCUT'); ?></strong>
 					</th>
@@ -5965,6 +6295,7 @@ static function spielerstatistik($spielerstatistik, $spielerstatistik_punkte, $a
 							</td>
 							<?php
 						}
+						$spiele_gesamt = $row->siege + $row->niederlagen + $row->unentschieden;
 						?>
 						<td nowrap
 							style="text-align: center"><?php echo $row->siege + $row->niederlagen + $row->unentschieden; ?></td>
@@ -5972,10 +6303,10 @@ static function spielerstatistik($spielerstatistik, $spielerstatistik_punkte, $a
 							style="text-align: center"><?php echo ($spielerstatistik->tabellenwertung == 0 ? "<strong>" : "") . $row->spielpunkte_gewonnen . ($spielerstatistik->tabellenwertung == 0 ? "<strong>" : ""); ?></strong></td>
 						<td nowrap
 							style="text-align: center"><?php echo $row->spielpunkte_verloren; ?></td>
-						<td nowrap
-							style="text-align: center"><?php echo ($row->spielpunkte_gewonnen > 0 || $row->spielpunkte_verloren > 0) ? round($row->spielpunkte_gewonnen * 100 / ($row->spielpunkte_gewonnen + $row->spielpunkte_verloren)) . "%" : "-"; ?></td>
 						<td nowrap style="text-align: center"><?php echo $row->punkte_gewonnen; ?></td>
 						<td nowrap style="text-align: center"><?php echo $row->punkte_verloren; ?></td>
+						<td nowrap
+							style="text-align: center"><?php echo ($spiele_gesamt > 0) ? round((($row->siege * 2 + $row->unentschieden) / ($spiele_gesamt * 2)) * 100) . "%" : "-"; ?></td>
 						<td nowrap style="text-align: center"><?php echo $row->siege; ?></td>
 						<td nowrap style="text-align: center"><?php echo $row->unentschieden; ?></td>
 						<td nowrap style="text-align: center"><?php echo $row->niederlagen; ?></td>

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

@@ -39,6 +39,7 @@ COM_SPORTSMANAGER_ORGANISATION="Organisation"
 COM_SPORTSMANAGER_TEAM_MEMBERS="Mannschaftsmitglieder"
 COM_SPORTSMANAGER_TEAM_MEMBERS2=Vereinsmitglieder
 COM_SPORTSMANAGER_MEMBERS="Mitglieder"
+COM_SPORTSMANAGER_MEMBER="Mitglied"
 COM_SPORTSMANAGER_ACTIVE_MEMBERS="Aktive Mitglieder"
 COM_SPORTSMANAGER_TEAMS="Mannschaften"
 COM_SPORTSMANAGER_CURRENT_TEAMS="Aktuelle Mannschaften"
@@ -72,7 +73,6 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Willst du die Rangliste wirklich entfe
 COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Individualwettbewerb hinzufügen"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individualwettbewerb"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individualwettbewerbe"
-COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"
 COM_SPORTSMANAGER_GAME="Spiel"
 COM_SPORTSMANAGER_GAMES="Spiele"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="S"
@@ -299,7 +299,7 @@ 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"
@@ -415,7 +415,7 @@ COM_SPORTSMANAGER_EXPORT="Exportieren"
 COM_SPORTSMANAGER_INTERNATIONAL_PLAYERS="Spieler (international)"
 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_IMPORT_MESSAGE="Im Import sind ausschlie&szlig;lich Spielerdaten zum Verein %s enthalten. Soll ausschlie&szlig;lich der Spielerbestand des einen Vereins aktualisiert werden, muss der zugeh&ouml;rige Verein unten ausgew&auml;hlt werden. Beinhaltet der Import den gesamten Spielerbestand einer Organisation, muss die zugeh&ouml;rige Organisation gew&auml;hlt werden.<br />Bei schon vorhandener Lizenznummer wird die Lizenznummer und das Geburtsjahr nicht &uuml;berschrieben!"
 COM_SPORTSMANAGER_CHECK="Pr&uuml;fen"
 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"
@@ -900,6 +900,9 @@ COM_SPORTSMANAGER_RESULT_ONLY="Nur Ergebnis"
 COM_SPORTSMANAGER_GAME_NUMBER="Spiel %d"
 COM_SPORTSMANAGER_LABEL_GAME_NUMBER="Spiel Nr"
 COM_SPORTSMANAGER_LABEL_GAME_TITLE="Spieltag Titel"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES="Explizite Strafen"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_SUBJECT="%s: Strafpunkte erhalten"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_BODY="%s wurden %f Strafpunkte zugeteilt mit der Begründung: %s"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_SUBJECT="%s vs %s: Spieltermin verlegen"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_BODY="Zur Begegnung %s gegen %s am %s in %s wird von %s der Spieltermin verschoben.\n\nAlternative Termine:\n\n"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_REQUESTED_BODY="Zur Begegnung %s gegen %s am %s in %s wird von %s der Spieltermin verschoben.\n\nBitte alternative Termine vorschlagen unter %s"
@@ -1070,3 +1073,29 @@ COM_SPORTSMANAGER_NOT_VALID_TIME="Ung&uuml;ltige Uhrzeit"
 COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Willst Du diesen Spielverlegung wirklich entfernen?"
 COM_SPORTSMANAGER_REST_DAYS="Ruhetage"
 COM_SPORTSMANAGER_TRAINING_DAYS="Trainingstage"
+COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Nicht aktualisierte Daten"
+COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"
+COM_SPORTSMANAGER_ASSOCIATION_BODY="Verbandsorgan"
+COM_SPORTSMANAGER_ADD_ASSOCIATION_BODY="Verbandsorgan hinzuf&uuml;gen"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY="Willst Du dieses Verbandsorgan wirklich entfernen?"
+COM_SPORTSMANAGER_INVALID_ASSOCIATION_BODY_NAME="Ung&uuml;ltiger Name f&uuml;r Verbandsorgan!"
+COM_SPORTSMANAGER_NAME_NOT_COMPLETE="Der Name ist nicht komplett ausgef&uuml;llt"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Zusatzinfo"
+COM_SPORTSMANAGER_USE_HTML="Hier sollte HTML-formatierter Text verwendet werden"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER="M&ouml;chtest du dieses Mitglied des Verbandsorgans wirklich entfernen?"
+COM_SPORTSMANAGER_HELP_EDIT_ASSOCIATION_BODY_MEMBER="Wird ein Name aus der Spielerliste ausgew&auml;hlt, werden Nachname und Vorname &uuml;bernommen.<br>Telefon, Mobil, E-Mail werden aus der Spielerliste &uuml;bernommen, wenn sie hier nicht ausgef&uuml;llt sind."
+COM_SPORTSMANAGER_HALL_OF_FAME="Hall of Fame"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME="Hall of Fame hinzuf&uuml;gen"
+COM_SPORTSMANAGER_INVALID_HALL_OF_FAME_NAME="Invalider Name f&uuml;r Hall of Fame"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME="Willst Du wirklich diese Hall of Fame mit allen Mitgliedern l&ouml;schen?"
+COM_SPORTSMANAGER_MATCH_TYPE="Spielform"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME_YEAR="Willst Du wirklich dieses Hall of Fame Jahr l&ouml;schen?"
+COM_SPORTSMANAGER_YEARS="Jahre"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME_YEAR="Hall of Fame Jahr hinzuf&uuml;gen"
+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&auml;gen gel&ouml;scht. Willst du den Spielbericht wirklich l&ouml;schen?"
+COM_SPORTSMANAGER_MATCH_REPORT_DELETED="Spielbericht gel&ouml;scht"
+COM_SPORTSMANAGER_MATCH_REPORT_WAS_DELETED="Der Spielbericht wurde erfolgreich gel&ouml;scht!"
+COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Spielberichtskorrektur"

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

@@ -39,6 +39,7 @@ COM_SPORTSMANAGER_ORGANISATION="Organisation"
 COM_SPORTSMANAGER_TEAM_MEMBERS="Team members"
 COM_SPORTSMANAGER_TEAM_MEMBERS2="Club members"
 COM_SPORTSMANAGER_MEMBERS="Members"
+COM_SPORTSMANAGER_MEMBER="Member"
 COM_SPORTSMANAGER_ACTIVE_MEMBERS="Active members"
 COM_SPORTSMANAGER_TEAMS="Teams"
 COM_SPORTSMANAGER_CURRENT_TEAMS="Current teams"
@@ -72,7 +73,6 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Do you really want to remove the ranki
 COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Add individual competition"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individual competition"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individual competitions"
-COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"
 COM_SPORTSMANAGER_GAME="Game"
 COM_SPORTSMANAGER_GAMES="Games"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="G"
@@ -299,7 +299,7 @@ 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"
@@ -415,7 +415,7 @@ COM_SPORTSMANAGER_EXPORT="Export"
 COM_SPORTSMANAGER_INTERNATIONAL_PLAYERS="Players (international)"
 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_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.<br />If a license number already exists, the license number and the year of birth will not be overwritten."
 COM_SPORTSMANAGER_CHECK="Check"
 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."
@@ -900,6 +900,9 @@ COM_SPORTSMANAGER_RESULT_ONLY="Result only"
 COM_SPORTSMANAGER_GAME_NUMBER="Game %d"
 COM_SPORTSMANAGER_LABEL_GAME_NUMBER="Game nr"
 COM_SPORTSMANAGER_LABEL_GAME_TITLE="Gameday title"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES="Explicit Penalties"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_SUBJECT="%s: received penalty"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_BODY="%s received a penalty of %f points based on the following justification: %s"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_SUBJECT="%s vs %s: Shift game appointment"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_BODY="For match %s versus %s on %s in %s the game appointment is shifted by %s.\n\nAlternative appointments:\n\n"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_REQUESTED_BODY="For match %s on %s in %s the game appointment is shifted by %s.\n\nPlease propose alternative appointments under %s"
@@ -1070,3 +1073,29 @@ 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_TRAINING_DAYS="Training days"
+COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Data not updated"
+COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"
+COM_SPORTSMANAGER_ASSOCIATION_BODY="Association body"
+COM_SPORTSMANAGER_ADD_ASSOCIATION_BODY="Add association body"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY="Do you really want to remove this association body?"
+COM_SPORTSMANAGER_INVALID_ASSOCIATION_BODY_NAME="Invalid association body name"
+COM_SPORTSMANAGER_NAME_NOT_COMPLETE="The name is not completely filled in"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Additional information"
+COM_SPORTSMANAGER_USE_HTML="HTML-formatted text should be used here."
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER="Do you really want to remove this association body member?"
+COM_SPORTSMANAGER_HELP_EDIT_ASSOCIATION_BODY_MEMBER="Selecting a name from the player list will fill in the first and last name.<br>Phone, mobile, and email are filled from the player list if left blank here."
+COM_SPORTSMANAGER_HALL_OF_FAME="Hall of Fame"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME="Add Hall of Fame"
+COM_SPORTSMANAGER_INVALID_HALL_OF_FAME_NAME="Invalid Hall of Fame name"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME="Are you sure you want to delete this Hall of Fame including all its members?"
+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_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"

src/structure/script.php

@@ -722,6 +722,18 @@ return new class () implements InstallerScriptInterface
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_team_strafen` ("
+		. "\n  `team_strafen_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n  `zeitpunkt` datetime NOT NULL,"
+		. "\n  `moderator_user_id` int(11) DEFAULT NULL,"
+		. "\n  `team_id` int(11) NOT NULL DEFAULT '0',"
+		. "\n  `strafe` float(6,2) NOT NULL DEFAULT '0',"
+		. "\n  `beschreibung` text NOT NULL,"
+		. "\n  PRIMARY KEY (`team_strafen_id`)"
+		. "\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_teamansprechpartner` ("
 		. "\n  `kontaktperson_id` int(11) NOT NULL AUTO_INCREMENT,"
 		. "\n  `team_id` int(11) NOT NULL DEFAULT '0',"
@@ -1049,6 +1061,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `erster_tag` date NOT NULL DEFAULT '0000-00-00',"
 		. "\n  `letzter_tag` date DEFAULT NULL,"
 		. "\n  `elo_wertung` tinyint(4) DEFAULT NULL,"
+		. "\n  `explizite_strafen` tinyint(4) DEFAULT '0',"
 		. "\n  `logo_url` TINYTEXT NOT NULL,"
 		. "\n  `ticker_logo_url` TINYTEXT NOT NULL,"
 		. "\n  `status` tinyint(4) NOT NULL DEFAULT '0',"
@@ -1184,11 +1197,82 @@ return new class () implements InstallerScriptInterface
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
 
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_verbandsorgane` ("
+			. "\n `verbandsorgane_id` int(11) NOT NULL AUTO_INCREMENT,"
+			. "\n `veranstalter_id` int(11) DEFAULT NULL,"
+			. "\n `verbandsorgan` varchar(32) DEFAULT NULL,"
+			. "\n `kategorie` int(4) DEFAULT NULL,"
+			. "\n `reihenfolge` int(4) DEFAULT NULL,"
+			. "\n `email` varchar(64) DEFAULT NULL,"
+			. "\n `beschreibung` text NOT NULL,"
+			. "\n PRIMARY KEY (`verbandsorgane_id`),"
+			. "\n KEY (`veranstalter_id`)"
+			. "\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,"
+			. "\n `funktion` varchar(32) DEFAULT NULL,"
+			. "\n `zusatzinfo` varchar(64) DEFAULT NULL,"
+			. "\n `spieler_id` int(11) DEFAULT NULL,"
+			. "\n `nachname` varchar(32) DEFAULT NULL,"
+			. "\n `vorname` varchar(32) DEFAULT NULL,"
+			. "\n `email` varchar(64) DEFAULT NULL,"
+			. "\n `telefon` varchar(32) DEFAULT NULL,"
+			. "\n `mobil` varchar(32) DEFAULT NULL,"
+			. "\n `reihenfolge` int(11) DEFAULT NULL,"
+			. "\n PRIMARY KEY (`mitglied_von_verbandsorgan_id`),"
+			. "\n KEY (`verbandsorgane_id`),"
+			. "\n KEY (`spieler_id`)"
+			. "\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_halloffame` ("
+		. "\n    `halloffame_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n    `veranstalter_id` int(11) DEFAULT NULL,"
+		. "\n    `halloffame` varchar(64) DEFAULT NULL,"
+		. "\n    `kategorie` int(4) DEFAULT NULL,"
+		. "\n    `spielform` int(11) DEFAULT NULL,"
+		. "\n    `reihenfolge` int(4) DEFAULT NULL,"
+		. "\n    PRIMARY KEY (`halloffame_id`),"
+		. "\n    KEY `veranstalter_id` (`veranstalter_id`)"
+		. "\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_halloffame` ("
+		. "\n    `mitglied_halloffame_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n    `halloffame_id` int(11) NOT NULL,"
+		. "\n    `jahr` int(4) DEFAULT NULL,"
+		. "\n    `platz` int(11) DEFAULT NULL,"
+		. "\n    `verein_id` int(11) DEFAULT NULL,"
+		. "\n    `teamname` varchar(64) DEFAULT NULL,"
+		. "\n    `spieler1_id` int(11) DEFAULT NULL,"
+		. "\n    `spieler1` varchar(64) DEFAULT NULL,"
+		. "\n    `spieler2_id` int(11) DEFAULT NULL,"
+		. "\n    `spieler2` varchar(64) DEFAULT NULL,"
+		. "\n    PRIMARY KEY (`mitglied_halloffame_id`),"
+		. "\n    UNIQUE KEY `halloffame_jahr_platz` (`halloffame_id`,`jahr`,`platz`),"
+		. "\n    KEY `halloffame_id` (`halloffame_id`),"
+		. "\n    KEY `verein_id` (`verein_id`),"
+		. "\n    KEY `spieler1_id` (`spieler1_id`),"
+		. "\n    KEY `spieler2_id` (`spieler2_id`)"
+		. "\n )  ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+
 		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'verbands_kuerzel', wert = 'tbe.';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
-		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '116';";
+		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '119';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
@@ -1677,6 +1761,10 @@ return new class () implements InstallerScriptInterface
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
+		$query = "DROP TABLE IF EXISTS `#__sportsmanager_team_strafen`;";
+		$db->setQuery( $query );
+		if (!$db->execute()) { die($db->stderr(true)); }
+
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_turnier`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
@@ -1748,5 +1836,21 @@ return new class () implements InstallerScriptInterface
 		$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)); }
 	}
 };