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

stage to prod

package.json

@@ -122,7 +122,6 @@
     "browser-sync": "^2.26.12",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.2",
-    "fs": "0.0.1-security",
     "gulp": "^4.0.2",
     "gulp-changed": "^4.0.2",
     "gulp-clean": "^0.4.0",

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

@@ -21,12 +21,13 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TEAMS_JOINT="Mannschaften in gem
 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_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"
 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 an durch Kommata getrennte Kategorienummern"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="Eine optionale Auswahl von Kategorienummern durch Kommata oder Spiegelstrich getrennt"
 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

@@ -21,12 +21,13 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TEAMS_JOINT="Teams in joint list
 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_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"
 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"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="An optional selection of category numbers seperated by commas or bullet point"
 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

@@ -5414,6 +5414,160 @@ function updateDatabase(): void
         }
     }
 
+    if ($datenbank_version < 113) {
+
+		// Korrektur Startuhrzeit in sportsmanager_turnierdisziplin bei eintägigen Veranstaltungen
+		$query = "UPDATE #__sportsmanager_turnierdisziplin td"
+			. "\n JOIN #__sportsmanager_turnier t ON td.turnier_id = t.turnier_id"
+			. "\n SET td.beginn = CONCAT(t.erster_tag, ' ', TIME(td.beginn))"
+			. "\n WHERE t.erster_tag = t.letzter_tag;";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '113'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+
+    if ($datenbank_version < 114) {
+
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_regelwerke` ("
+		. "\n `regelwerke_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n `regelwerk` varchar(32) NOT NULL,"
+		. "\n PRIMARY KEY (`regelwerke_id`),"
+		. "\n UNIQUE KEY `regelwerk` (`regelwerk`)"
+		. "\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,"
+		. "\n `paragraph_spo` varchar(32) NOT NULL DEFAULT '',"
+		. "\n `paragraph_go` varchar(32) NOT NULL DEFAULT '',"
+		. "\n `verstoss` varchar(64) NOT NULL DEFAULT '',"
+		. "\n `haupttext` text NOT NULL,"
+		. "\n `zusatztext` text NOT NULL,"
+		. "\n `gebuehr` smallint(3) NOT NULL DEFAULT 0,"
+		. "\n `zusatzgebuehr` smallint(2) NOT NULL DEFAULT 0,"
+		. "\n `zur_auswahl` tinyint(1) NOT NULL DEFAULT 1,"
+		. "\n PRIMARY KEY (`verstoesse_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_ordnungsstrafen` ("
+		. "\n `ordnungsstrafen_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n `verstoesse_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `begegnung_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `team_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `aussteller_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `ausstelldatum` datetime NOT NULL DEFAULT current_timestamp(),"
+		. "\n `versender_id` int(11) DEFAULT NULL,"
+		. "\n `versendedatum` datetime DEFAULT NULL,"
+		. "\n `rechnungssteller_id` int(11) DEFAULT NULL,"
+		. "\n `rechnungsdatum` datetime DEFAULT NULL,"
+		. "\n `multiplikator` tinyint(1) NOT NULL DEFAULT 1,"
+		. "\n `weitere_angaben` text NOT NULL,"
+		. "\n PRIMARY KEY (`ordnungsstrafen_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_email_vorlagen` ("
+		. "\n `email_vorlagen_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n `vorlage` varchar(64) NOT NULL,"
+		. "\n `betreff` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `von` varchar(64) NOT NULL DEFAULT '',"
+		. "\n `an` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `cc` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `bcc` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `email_text` text NOT NULL,"
+		. "\n PRIMARY KEY (`email_vorlagen_id`),"
+		. "\n UNIQUE KEY `vorlage` (`vorlage`)"
+		. "\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 = 'ordnungsstrafen_verwenden', wert = '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)); }
+
+		$query = "ALTER TABLE `#__sportsmanager_veranstaltung` ADD COLUMN IF NOT EXISTS `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'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+
+    if ($datenbank_version < 115) {
+
+		// Erweiterung Tabelle #__sportsmanager_verschieberegel
+		$query = "ALTER TABLE `#__sportsmanager_verschieberegel`"
+				."\n ADD COLUMN IF NOT EXISTS `begruendung_erforderlich` INT(1) NOT NULL DEFAULT 0 AFTER `ablehnen`,"
+				."\n ADD COLUMN IF NOT EXISTS `vereine_berechtigt`       INT(1) NOT NULL DEFAULT 1 AFTER `begruendung_erforderlich`,"
+				."\n ADD COLUMN IF NOT EXISTS `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');";
+        $db->setQuery($query);
+        if (!$db->execute()) { die($db->stderr(true)); }
+		
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '115'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+	
+    if ($datenbank_version < 116) {
+
+		$query = "ALTER TABLE `#__sportsmanager_spielort`"
+			. "\n ADD IF NOT EXISTS `telefon` VARCHAR(64) NULL DEFAULT NULL AFTER `url`,"
+			. "\n ADD IF NOT EXISTS `email` VARCHAR(64) NULL DEFAULT NULL AFTER `telefon`,"
+			. "\n ADD IF NOT EXISTS `ruhetage` VARCHAR(64) NULL DEFAULT NULL AFTER `email`;";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+		
+        $query = "ALTER TABLE `#__sportsmanager_team`"
+			. "\n ADD IF NOT EXISTS `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 ($termin_aktionen_email_setzen) {
         $query = "SELECT aktion_user_id, termin_aktion_id"
             . "\n FROM #__sportsmanager_termin_aktion";

src/structure/components/com_sportsmanager/sportsmanager.php

@@ -215,6 +215,24 @@ if ($task == "spielerbild") {
         case 'admin_verschieben_modus_remove':
             adminRemoveVerschiebenModus();
             break;
+		case 'admin_spielverlegungen';
+			adminSpielverlegungen();
+			break;
+		case 'admin_spielverlegung_edit';
+			adminEditSpielverlegung();
+			break;
+		case 'admin_spielverlegung_save';
+			adminSaveSpielverlegung();
+			break;
+		case 'admin_spielverlegung_remove';
+			adminRemoveSpielverlegung();
+			break;
+        case 'admin_spielverlegungen_export':
+            adminExportSpielverlegungen();
+            break;
+		case 'admin_spielverlegung_mailen';
+			adminSpielverlegungMailen();
+			break;
         case 'admin_kategorien':
             adminKategorien();
             break;
@@ -350,6 +368,60 @@ if ($task == "spielerbild") {
         case 'admin_rechnung_remove':
             adminRemoveRechnung();
             break;
+        case 'admin_joomla_mail_senden':
+            sendJoomlaMail();
+            break;
+        case 'admin_regelwerke':
+            adminRegelwerke();
+            break;
+        case 'admin_regelwerk_edit':
+            adminEditRegelwerk();
+            break;
+        case 'admin_regelwerk_save':
+            adminSaveRegelwerk();
+            break;
+        case 'admin_regelwerk_remove':
+            adminRemoveRegelwerk();
+            break;
+        case 'admin_ordnungsstrafe_mailen':
+            adminOrdnungsstrafeMailen();
+            break;
+        case 'admin_ordnungsstrafen':
+            adminOrdnungsstrafen();
+            break;
+        case 'admin_ordnungsstrafe_edit':
+            adminEditOrdnungsstrafe();
+            break;
+        case 'admin_ordnungsstrafe_save':
+            adminSaveOrdnungsstrafe();
+            break;
+        case 'admin_ordnungsstrafe_remove':
+            adminRemoveOrdnungsstrafe();
+            break;
+        case 'admin_ordnungsstrafen_export':
+            adminExportOrdnungsstrafen();
+            break;
+        case 'admin_verstoesse':
+            adminVerstoesse();
+            break;
+        case 'admin_verstoss_edit':
+            adminEditVerstoss();
+            break;
+        case 'admin_verstoss_save':
+            adminSaveVerstoss();
+            break;
+        case 'admin_verstoss_remove':
+            adminRemoveVerstoss();
+            break;
+        case 'admin_ordnungsstrafen_vorlage':
+            adminEditEmailVorlage('Ordnungsstrafe');
+            break;
+		case 'admin_spielverlegung_vorlage';
+			adminEditEmailVorlage('Spielverlegung');
+			break;
+        case 'admin_email_vorlage_save':
+            adminSaveEmailVorlage();
+            break;
         case 'admin_moderatoren':
             adminModeratoren();
             break;
@@ -987,6 +1059,8 @@ if ($task == "spielerbild") {
             adminTermine(0);
             break;
     }
+} else if ($content == 'spielverlegungen') {
+    spielverlegungen();
 } else if ($content == 'login') {
     userAuth();
 } else if ($content == 'login_refresh') {
@@ -2388,6 +2462,24 @@ function turnierbaumAnzeigen($veranstaltung): void
 				else
 					$begegnungen[$begegnung['Spieltag_Nr'] + 1][round($begegnung['Spiel_Nr'] / 2)]['gast'] = htmlentities($begegnung['Gast']);
 			}
+		} else 
+		if ($begegnung['Heim_Satzpunkte'] == $begegnung['Gast_Satzpunkte'] && $begegnung['Heim_Tore'] > $begegnung['Gast_Tore']) {
+			$begegnungen[$begegnung['Spieltag_Nr']][$begegnung['Spiel_Nr']]['sieger'] = 1;
+			if ($begegnung['Spieltag_Nr'] < $anzahlRunden){
+				if (round($begegnung['Spiel_Nr'] % 2))
+					$begegnungen[$begegnung['Spieltag_Nr'] + 1][round($begegnung['Spiel_Nr'] / 2)]['heim'] = htmlentities($begegnung['Heim']);
+				else
+					$begegnungen[$begegnung['Spieltag_Nr'] + 1][round($begegnung['Spiel_Nr'] / 2)]['gast'] = htmlentities($begegnung['Heim']);
+			}
+		} else 
+		if ($begegnung['Heim_Satzpunkte'] == $begegnung['Gast_Satzpunkte'] && $begegnung['Heim_Tore'] < $begegnung['Gast_Tore']) {
+			$begegnungen[$begegnung['Spieltag_Nr']][$begegnung['Spiel_Nr']]['sieger'] = 2;
+			if ($begegnung['Spieltag_Nr'] < $anzahlRunden){
+				if (round($begegnung['Spiel_Nr'] % 2))
+					$begegnungen[$begegnung['Spieltag_Nr'] + 1][round($begegnung['Spiel_Nr'] / 2)]['heim'] = htmlentities($begegnung['Gast']);
+				else
+					$begegnungen[$begegnung['Spieltag_Nr'] + 1][round($begegnung['Spiel_Nr'] / 2)]['gast'] = htmlentities($begegnung['Gast']);
+			}
 		} else {
 			$begegnungen[$begegnung['Spieltag_Nr']][$begegnung['Spiel_Nr']]['sieger'] = 0;
 		}
@@ -2410,7 +2502,7 @@ function begegnungenAnzeigen($veranstaltung, $verein_id, $spielort_id, $zeitfens
             . "\n (SELECT vorschlagendes_team_id FROM #__sportsmanager_unbestaetigtes_ergebnis AS tt1 WHERE tt1.begegnung_id = t1.begegnung_id LIMIT 1) AS unbestaetigtes_ergebnis_team_id,"
             . "\n (SELECT IF(aktion NOT IN (0, 3, 4), NULL, tt1.eingetragen) FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verlegung_eingetragen,"
             . "\n (SELECT verantwortlich_team_id FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verantwortlich_team_id,"
-            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
+            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND t6.vereine_berechtigt = 1 AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
             . "\n FROM #__sportsmanager_begegnung AS t1"
             . "\n LEFT JOIN #__sportsmanager_spielort AS s1 ON t1.spielort_id = s1.spielort_id"
             . "\n LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id"
@@ -2430,7 +2522,7 @@ function begegnungenAnzeigen($veranstaltung, $verein_id, $spielort_id, $zeitfens
             . "\n (SELECT vorschlagendes_team_id FROM #__sportsmanager_unbestaetigtes_ergebnis AS tt1 WHERE tt1.begegnung_id = t1.begegnung_id LIMIT 1) AS unbestaetigtes_ergebnis_team_id,"
             . "\n (SELECT IF(aktion NOT IN (0, 3, 4), NULL, tt1.eingetragen) FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verlegung_eingetragen,"
             . "\n (SELECT verantwortlich_team_id FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verantwortlich_team_id,"
-            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
+            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND t6.vereine_berechtigt = 1 AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
             . "\n FROM #__sportsmanager_begegnung AS t1"
             . "\n LEFT JOIN #__sportsmanager_spielort AS s1 ON t1.spielort_id = s1.spielort_id"
             . "\n LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id"
@@ -2451,7 +2543,7 @@ function begegnungenAnzeigen($veranstaltung, $verein_id, $spielort_id, $zeitfens
             . "\n (SELECT vorschlagendes_team_id FROM #__sportsmanager_unbestaetigtes_ergebnis AS tt1 WHERE tt1.begegnung_id = t1.begegnung_id LIMIT 1) AS unbestaetigtes_ergebnis_team_id,"
             . "\n (SELECT IF(aktion NOT IN (0, 3, 4), NULL, tt1.eingetragen) FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verlegung_eingetragen,"
             . "\n (SELECT verantwortlich_team_id FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verantwortlich_team_id,"
-            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
+            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND t6.vereine_berechtigt = 1 AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
             . "\n FROM #__sportsmanager_begegnung AS t1"
             . "\n LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id"
             . "\n LEFT JOIN #__sportsmanager_team AS t3 ON t1.gast_team_id = t3.team_id"
@@ -2478,7 +2570,7 @@ function begegnungenAnzeigen($veranstaltung, $verein_id, $spielort_id, $zeitfens
             . "\n (SELECT IF(aktion NOT IN (0, 3, 4), NULL, tt1.eingetragen) FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verlegung_eingetragen,"
             . "\n (SELECT verantwortlich_team_id FROM #__sportsmanager_begegnung_historie AS tt1 USE INDEX (begegnung_id) WHERE tt1.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verantwortlich_team_id,"
 //
-            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
+            . "\n IF(NOT ISNULL(t6.verschieberegel_id) AND t6.vereine_berechtigt = 1 AND (t6.vorlaufzeit_tage = 0 OR DATEDIFF(zeitpunkt, CURDATE()) >= t6.vorlaufzeit_tage), 1, 0) AS verschieberegel_erfuellt"
             . "\n FROM #__sportsmanager_begegnung AS t1"
             . "\n LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id"
             . "\n LEFT JOIN #__sportsmanager_team AS t3 ON t1.gast_team_id = t3.team_id"
@@ -3228,7 +3320,7 @@ function spielerDetails(): void
     $statistik["elo_doppel"] = loadResult($db, $query) && $elo_anzeigen;
 
     if (isJson()) {
-        JSON_sportsmanager::    spielerDetails($spieler, $vereine, $veranstalter, $spieler_elo_verlauf_einzel, $spieler_elo_verlauf_doppel, $spielerNamen, $teamNamen, $veranstaltungBezeichnungen, $turnierdisziplinBezeichnungen, $individualwettbewerbBezeichnungen, $ranglistenplatzierungen, $turnierplatzierungen, $teams, $elo_detailliert, $statistik, $einstufungen);
+        JSON_sportsmanager::spielerDetails($spieler, $vereine, $veranstalter, $spieler_elo_verlauf_einzel, $spieler_elo_verlauf_doppel, $spielerNamen, $teamNamen, $veranstaltungBezeichnungen, $turnierdisziplinBezeichnungen, $individualwettbewerbBezeichnungen, $ranglistenplatzierungen, $turnierplatzierungen, $teams, $elo_detailliert, $statistik, $einstufungen);
     } else {
         HTML_sportsmanager::spielerDetails($spieler, $vereine, $veranstalter, $spieler_elo_verlauf_einzel, $spieler_elo_verlauf_doppel, $spielerNamen, $teamNamen, $veranstaltungBezeichnungen, $turnierdisziplinBezeichnungen, $individualwettbewerbBezeichnungen, $ranglistenplatzierungen, $turnierplatzierungen, $teams, $sortierung, $vorheriger_spieler_id, $naechster_spieler_id, $elo_detailliert, $statistik, $beginn, $kategorie, $einstufungen, $filter, $veranstaltungid, $veranstalterid, $einstufungid, $unabhaengige_ansicht, $details_anzeigen, $lizenz_anzeigen);
     }
@@ -4025,6 +4117,105 @@ function spielort(): void
     HTML_sportsmanager::iCalBegegnungen(SportsManagerURL('&task=spielort_begegnungen_ical&id=' . $id));
 }
 
+function spielverlegungen(): void
+{
+    $db = getDatabase();
+    global $params;
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+    $filter_status = $jInput->get('filter_status', '', 'RAW');
+	
+	if (empty($filter_status))
+		$filter_status = "offen,genehmigt";
+	
+    $query = "SELECT saison_id, saisonbezeichnung"
+        . "\n FROM #__sportsmanager_saison"
+        . "\n ORDER BY saisonbezeichnung DESC LIMIT 1";
+    $saisons = loadObjectList($db, $query);
+	$filter_saison_id = $saisons[0]->saison_id;
+	
+	$query = "SELECT t1.begegnung_historie_id AS beantragt_id, t1.begegnung_id AS begegnung_id,"
+		. "\n t1.eingetragen AS beantragt, t1.kommentar AS Begruendung_beantragt, t1.zeitpunkt AS Termin_alt,"
+		. "\n t1.team_id as beantragt_verein, t5.bezeichnung AS Liga,"
+		. "\n t3.teamname AS Heim, t4.teamname AS Gast, t6.teamname AS beantragt_von, 'offen' AS status"
+		. "\n FROM #__sportsmanager_begegnung_historie AS t1"
+		. "\n LEFT JOIN #__sportsmanager_begegnung AS t2 ON t2.begegnung_id = t1.begegnung_id"
+		. "\n LEFT JOIN #__sportsmanager_team AS t3 ON t3.team_id = t2.heim_team_id"
+		. "\n LEFT JOIN #__sportsmanager_team AS t4 ON t4.team_id = t2.gast_team_id"
+		. "\n LEFT JOIN #__sportsmanager_veranstaltung AS t5 ON t5.veranstaltung_id = t4.veranstaltung_id"
+		. "\n LEFT JOIN #__sportsmanager_team AS t6 ON t6.team_id = t1.team_id"
+		. "\n WHERE t1.aktion = 2"
+		. "\n AND t5.saison_id = '$filter_saison_id'"
+		. kategorieFilter("AND t5.kategorie IN")
+		. "\n ORDER BY t1.begegnung_id, t1.zeitpunkt ASC;";
+	$spielverlegungen = loadObjectList($db, $query);
+	
+	$last_id = "";
+	foreach ($spielverlegungen as $key => $spielverlegung) {
+		if ($spielverlegung->begegnung_id == $last_id) {
+			unset($spielverlegungen[$key]);
+		} else {
+			$last_id = $spielverlegung->begegnung_id;
+			
+			$query = "SELECT t1.begegnung_historie_id AS genehmigt_id, t1.eingetragen AS genehmigt,"
+				. "\n t1.user_id AS genehmigt_von, t1.team_id as genehmigt_verein, t1.zeitpunkt AS Termin_neu"
+				. "\n FROM #__sportsmanager_begegnung_historie AS t1"
+				. "\n LEFT JOIN #__sportsmanager_begegnung AS t2 ON t2.begegnung_id = t1.begegnung_id"
+				. "\n WHERE t1.aktion = 1 AND t1.begegnung_id = $last_id"
+				. "\n ORDER BY t1.zeitpunkt DESC LIMIT 1;";
+				
+			$genehmigt = loadObjectList($db, $query);
+			
+			if (!empty($genehmigt)) {
+				$spielverlegung->genehmigt_id = $genehmigt[0]->genehmigt_id;
+				$spielverlegung->genehmigt = $genehmigt[0]->genehmigt;
+				$spielverlegung->Termin_neu = $genehmigt[0]->Termin_neu;
+				$spielverlegung->genehmigt_von = $genehmigt[0]->genehmigt_von;
+				$spielverlegung->genehmigt_verein = $genehmigt[0]->genehmigt_verein;
+				$spielverlegung->status = "genehmigt";
+			} else {
+				$spielverlegung->genehmigt_id = "";
+				$spielverlegung->genehmigt = "";
+				$spielverlegung->Termin_neu = "";
+				$spielverlegung->genehmigt_von = "";
+				$spielverlegung->genehmigt_verein = "";
+			}
+
+			$query = "SELECT t1.begegnung_historie_id AS abgelehnt_id, t1.eingetragen AS abgelehnt,"
+				. "\n t1.user_id AS abgelehnt_von, t1.team_id as abgelehnt_verein,"
+				. "\n t1.kommentar AS Begruendung_abgelehnt"
+				. "\n FROM #__sportsmanager_begegnung_historie AS t1"
+				. "\n LEFT JOIN #__sportsmanager_begegnung AS t2 ON t2.begegnung_id = t1.begegnung_id"
+				. "\n WHERE t1.aktion = 10 AND t1.begegnung_id = $last_id"
+				. "\n ORDER BY t1.zeitpunkt DESC LIMIT 1;";
+				
+			$abgelehnt = loadObjectList($db, $query);
+			
+			if (!empty($abgelehnt)) {
+				$spielverlegung->abgelehnt_id = $abgelehnt[0]->abgelehnt_id;
+				$spielverlegung->abgelehnt = $abgelehnt[0]->abgelehnt;
+				$spielverlegung->abgelehnt_von = $abgelehnt[0]->abgelehnt_von;
+				$spielverlegung->abgelehnt_verein = $abgelehnt[0]->abgelehnt_verein;
+				$spielverlegung->Begruendung_abgelehnt = $abgelehnt[0]->Begruendung_abgelehnt;
+				$spielverlegung->status = "abgelehnt";
+			} else {
+				$spielverlegung->abgelehnt_id = "";
+				$spielverlegung->abgelehnt = "";
+				$spielverlegung->abgelehnt_von = "";
+				$spielverlegung->abgelehnt_verein = "";
+				$spielverlegung->Begruendung_abgelehnt = "";
+			}
+		}
+	}
+
+	$spielverlegungen = array_values($spielverlegungen);
+
+    if (isJson()) {
+        echo json_encode($spielverlegungen);
+    } else {
+        HTML_sportsmanager::spielverlegungen($params->get('titel'), $params->get('beschreibung'), $spielverlegungen);
+    }
+}
+
 function begegnungSpielplan($teamansicht = false): void
 {
     $db = getDatabase();
@@ -4211,7 +4402,11 @@ function begegnungVerlegenForm(): void
         die("Missing id!");
     $aus_uebersicht = $jInput->get('aus_uebersicht', 0, 'INT');
 
-    $query = "SELECT #__sportsmanager_veranstaltung.*, initial_ohne_termin, keine_gegenvorschlaege, vorlaufzeit_tage, termine_minimal, termine_maximal, ablehnen FROM #__sportsmanager_veranstaltung LEFT JOIN #__sportsmanager_verschieberegel USING (verschieberegel_id) WHERE veranstaltung_id = $veranstaltungid";
+    $query = "SELECT #__sportsmanager_veranstaltung.*, initial_ohne_termin, keine_gegenvorschlaege, vorlaufzeit_tage,"
+		. "\n termine_minimal, termine_maximal, ablehnen, begruendung_erforderlich" 
+		. "\n FROM #__sportsmanager_veranstaltung LEFT JOIN #__sportsmanager_verschieberegel USING (verschieberegel_id)"
+		. "\n WHERE veranstaltung_id = $veranstaltungid";
+		
     $rows = loadObjectList($db, $query);
     if (count($rows) < 1)
         die("Wrong id!");
@@ -4295,6 +4490,7 @@ function begegnungVerlegen(): void
     $aus_uebersicht = $jInput->get('aus_uebersicht', 0, 'INT');
     $angefordert = $jInput->get('anfordern', false, 'BOOL');
     $abgelehnt = $jInput->get('ablehnen', false, 'BOOL');
+	$verlegungsgrund = $jInput->get('verlegungsgrund', '', 'RAW');
 
     if ($jInput->get('cancel', false, 'BOOL')) {
         redirectSportsManagerURL('&task=' . ($aus_uebersicht ? 'veranstaltungen' : 'veranstaltung') . '&veranstaltungid=' . $veranstaltungId);
@@ -4362,7 +4558,7 @@ function begegnungVerlegen(): void
     $aktueller_zeitpunkt = date('Y-m-d H:i:s');
     if (count($verlegen_aktionen) == 0 || $verlegen_aktionen[0]->aktion == 1 || $verlegen_aktionen[0]->aktion == 5 || $verlegen_aktionen[0]->aktion == 10) {
         $query = "INSERT INTO #__sportsmanager_begegnung_historie (begegnung_id, aktion, zeitpunkt, user_id, team_id, verantwortlich_team_id, kommentar, eingetragen)"
-            . "\n VALUES ($id, 2, '$begegnung->zeitpunkt', NULL, NULL, NULL, NULL, '$aktueller_zeitpunkt');";
+            . "\n VALUES ($id, 2, '$begegnung->zeitpunkt', '$user_id', '$vorschlagendes_team_id', '" . ($vorschlagendes_team_id == $begegnung->heim_team_id ? $begegnung->gast_team_id : $begegnung->heim_team_id) . "', '$verlegungsgrund', '$aktueller_zeitpunkt');";
         $db->setQuery($query);
         if (!$db->execute()) {
             abortWithError($db->stderr(true));
@@ -4371,7 +4567,7 @@ function begegnungVerlegen(): void
 
     if ($angefordert) {
         $query = "INSERT INTO #__sportsmanager_begegnung_historie (begegnung_id, aktion, zeitpunkt, user_id, team_id, verantwortlich_team_id, kommentar, eingetragen)"
-            . "\n VALUES ($id, 3, NULL, '$user_id', '$vorschlagendes_team_id', '" . ($vorschlagendes_team_id == $begegnung->heim_team_id ? $begegnung->gast_team_id : $begegnung->heim_team_id) . "', NULL, '$aktueller_zeitpunkt');";
+            . "\n VALUES ($id, 3, NULL, '$user_id', '$vorschlagendes_team_id', '" . ($vorschlagendes_team_id == $begegnung->heim_team_id ? $begegnung->gast_team_id : $begegnung->heim_team_id) . "', '$verlegungsgrund', '$aktueller_zeitpunkt');";
         $db->setQuery($query);
         if (!$db->execute()) {
             abortWithError($db->stderr(true));

src/structure/components/com_sportsmanager/tools.php

@@ -185,17 +185,45 @@ function individualwettbewerbFilter($prefix): string
 function kategorieFilter($prefix, $suffix = ""): string
 {
     global $params;
+
     $kategorien = explode(",", $params->get('kategorien'));
-    $filter = "";
-    foreach ($kategorien as $s) {
-        $kategorie = intval(trim($s));
-        if ($kategorie == 0)
-            continue;
-        if (!empty($filter))
-            $filter .= ", ";
-        $filter .= $kategorie;
+    $result = [];
+
+    foreach ($kategorien 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 || $start > $end) continue;
+
+            for ($i = $start; $i <= $end; $i++) {
+                $result[$i] = true; // Duplikate vermeiden
             }
-    return empty($filter) ? "" : (" " . $prefix . " (" . $filter . ") " . $suffix);
+        } else {
+            $num = intval($item);
+            if ($num > 0) {
+                $result[$num] = true;
+            }
+        }
+    }
+
+    if (empty($result)) {
+        return "";
+    }
+
+    $filter = array_keys($result);
+    sort($filter, SORT_NUMERIC);
+
+    return " $prefix (" . implode(", ", $filter) . ") $suffix";
 }
 
 function turnierFilter($prefix): string

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

@@ -24,6 +24,7 @@
       <option value="vereine"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CLUBS]]></option>
       <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>
       </field>
       <field name="titel"
             type="text"

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

@@ -2648,6 +2648,8 @@ global $params;
 								echo htmlentities_utf8($team->name);
 							$anschrift = $team->strasse . (!empty($team->strasse) && (!empty($team->plz) || !empty($team->ortsname) || !empty($team->ortsteil)) ? ", " : "") . $team->plz . (!empty($team->plz) ? " " : "") . $team->ortsname . (!empty($team->ortsname) && !empty($team->ortsteil) ? "-" : "") . $team->ortsteil;
 							echo "<br />" . htmlentities_utf8($anschrift);
+							if (!empty($team->telefon))
+								echo "<br />" . htmlentities_utf8($team->telefon);
 							?>
 						</td>
 					</tr>
@@ -3929,6 +3931,76 @@ static function spielort($spielort, $begegnung_zeitpunkt, $aktuelle_teams, $vorh
 	}
 }
 
+static function spielverlegungen($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
+	}
+	?>
+	<div class="uk-overflow-auto">
+		<table class="uk-table-shrink contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>"  style='width: 1000px;'>
+		<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_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: 150px;'><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>
+		</tr>
+	<?php
+	if (count($rows) > 0) {
+		$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 style='text-align: center;'>
+					<?php echo htmlentities_utf8($row->Liga); ?>
+				</td>
+				<td nowrap style='text-align: center;'>
+					<?php 
+					if ($row->Heim == $row->beantragt_von)
+						echo "<u>" . htmlentities_utf8($row->Heim) . "</u>";
+					else
+						echo htmlentities_utf8($row->Heim);
+					echo "<br>";
+					if ($row->Gast == $row->beantragt_von)
+						echo "<u>" . htmlentities_utf8($row->Gast) . "</u>";
+					else
+						echo htmlentities_utf8($row->Gast);
+					?>
+				</td>
+				<td nowrap style='text-align: center;'>
+					<?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))); ?>
+				</td>
+				<td nowrap style='text-align: left;'>
+					<?php echo htmlentities_utf8($row->Begruendung_beantragt); ?>
+				</td>
+			</tr>
+		<?php
+		}
+	}
+	?>
+	</table></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;
@@ -4284,7 +4356,11 @@ static function spielerDetails($spieler, $vereine, $veranstalter, $spieler_elo_v
 								$einstufungid, $unabhaengige_ansicht, $details_anzeigen, $lizenz_anzeigen):void {
 global $params;
 
-if (count($vereine) == 0){echo "Sie haben keine Berechtigung auf diesen Datensatz!!!"; die;}
+if ((count($vereine) == 0) && !benutzerZugriff("spieler_aendern") && !benutzerVeranstalterModerator() && !benutzerVereinModerator())
+{
+	echo "Sie haben keine Berechtigung auf diesen Datensatz!!!"; 
+	die;
+}
 
 ?>
 <table style="width: 100%; border: none; border-spacing: 0; padding: 3px">
@@ -5118,11 +5194,7 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 
 	<form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="uk-overflow-auto">
-			<table class="uk-table" style="width: 100%">
-				<tr>
-					<td nowrap style="width: 60%; vertical-align: top">
-						<div class="uk-overflow-auto">
-							<table class="uk-table" style="width: 100%">
+			<table style="width: 100%">
 				<tr>
 					<td nowrap style="width: 20%; text-align: right">
 						<?php echo Text::_('COM_SPORTSMANAGER_ORIGINALY_SCHEDULED'); ?>:
@@ -5190,7 +5262,22 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 							return anzahl_termine >= termine_minimal;
 						}
 					</script>
+				<?PHP if ($veranstaltung->begruendung_erforderlich && empty($verlegen_aktionen)){ ?>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="reason"><?php echo Text::_('COM_SPORTSMANAGER_REASON_GAME_APPOINTMENT'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text"
+								   name="verlegungsgrund"
+								   id="reason"
+								   size="100" maxlength="255"/>
+						</td>
+					</tr>
 				<?php
+				}
 				for ($termin = 1;
 				$termin <= $anzahl_moegliche_termine;
 				$termin++) {
@@ -5214,7 +5301,7 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 							</script>
 							<select
 								aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_DAY') . ' ' . $termin ?>"
-												class="uk-select uk-form-width-medium"
+								class="uk-select uk-form-width-small"
 								name="datum_tag_<?php echo $termin; ?>" size="1"
 								onChange="termin_changed_<?php echo $termin; ?>();">
 								<?php
@@ -5230,7 +5317,7 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 							</select>
 							<select
 								aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MONTH') . ' ' . $termin ?>"
-												class="uk-select uk-form-width-medium"
+								class="uk-select uk-form-width-small"
 								name="datum_monat_<?php echo $termin; ?>" size="1"
 								onChange="termin_changed_<?php echo $termin; ?>();">
 								<?php
@@ -5244,7 +5331,7 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 							</select>
 							<select
 								aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_YEAR') . ' ' . $termin ?>"
-												class="uk-select uk-form-width-medium"
+								class="uk-select uk-form-width-small"
 								name="datum_jahr_<?php echo $termin; ?>" size="1"
 								onChange="termin_changed_<?php echo $termin; ?>();">
 								<?php
@@ -5257,7 +5344,7 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 							</select>
 							<select
 								aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_HOUR') . ' ' . $termin ?>"
-												class="uk-select uk-form-width-medium"
+								class="uk-select uk-form-width-small"
 								name="uhrzeit_stunden_<?php echo $termin; ?>" size="1"
 								onChange="termin_changed_<?php echo $termin; ?>();">
 								<?php
@@ -5272,7 +5359,7 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 							</select>
 							<select
 								aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MINUTE') . ' ' . $termin ?>"
-												class="uk-select uk-form-width-medium"
+								class="uk-select uk-form-width-small"
 								name="uhrzeit_minuten_<?php echo $termin; ?>" size="1"
 								onChange="termin_changed_<?php echo $termin; ?>();">
 								<?php
@@ -5363,10 +5450,6 @@ function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $
 				?>
 			</table>
 		</div>
-					</td>
-				</tr>
-			</table>
-		</div>
 
 		<?php
 		if ($berechtigt_anfordern) {

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

@@ -321,6 +321,7 @@ COM_SPORTSMANAGER_VIEW_LEAST_MEMBER_COUNT="Mindest Mitgliederzahl zeigen (Verein
 COM_SPORTSMANAGER_SHOW_ORGANISATION="Spalte Verband zeigen (Vereine)"
 COM_SPORTSMANAGER_SHOW_MEMBER_COUNT="Spalte Mitglieder Zeigen (Vereine)"
 COM_SPORTSMANAGER_SHOW_TOURNAMENT_BRACKET="Turnierbaum anzeigen"
+COM_SPORTSMANAGER_USE_DISCIPLINARY_FINE="Ordnungsstrafen verwenden"
 COM_SPORTSMANAGER_PLAYER_DETAILS="Spielerdetails"
 COM_SPORTSMANAGER_PLAYER_LIST_DETAILS="Spielerliste/-details"
 COM_SPORTSMANAGER_PLAYER_EDIT="Spielerdaten durch Organisations-/Vereinsansprechpartner bearbeiten"
@@ -363,6 +364,7 @@ COM_SPORTSMANAGER_STATISTIK="Statistik"
 COM_SPORTSMANAGER_PLAYERS_ACTIVE="Spieler aktiv"
 COM_SPORTSMANAGER_RESTRICTED_PLAYERS="Spieler eingeschränkt"
 COM_SPORTSMANAGER_PLAYER_PASSIV="Spieler passiv"
+COM_SPORTSMANAGER_PLAYER_UNATTACHED="Spieler vereinslos"
 COM_SPORTSMANAGER_MEN_ACTIVE="Herren aktiv"
 COM_SPORTSMANAGER_WOMEN_ACTIVE="Damen aktiv"
 COM_SPORTSMANAGER_JUNIOR_ACTIVE="Junioren aktiv"
@@ -514,7 +516,6 @@ COM_SPORTSMANAGER_ADD_POINTS_TABLE="Punktetabelle hinzufügen"
 COM_SPORTSMANAGER_ADD_FUNCTION="Funktion hinzufügen"
 COM_SPORTSMANAGER_PARTICIPANT="Teilnehmer"
 COM_SPORTSMANAGER_FUNCTION="Funktion"
-COM_SPORTSMANAGER_MULTIPLIER="Multiplikator"
 COM_SPORTSMANAGER_MAXIMUM="maximal"
 COM_SPORTSMANAGER_CONTRACTION="Kürzel"
 COM_SPORTSMANAGER_ELIGIBLE_ORGANIZERS="Berechtigte für Veranstalter"
@@ -575,7 +576,7 @@ COM_SPORTSMANAGER_PRIVATE_PLAYER_DATA="Private Spielerdaten in Vereins- und Mann
 COM_SPORTSMANAGER_ASSOCIATIONS_MEMBERSHIPS_MANAGE="Vereine und Mitgliedschaften verwalten"
 COM_SPORTSMANAGER_MANAGE_CLASSIFICATIONS="Einstufungen verwalten"
 COM_SPORTSMANAGER_MANAGE_TEAM_PLANS="Mannschaftsspielpläne verwalten"
-COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Verschieberegeln verwalten"
+COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Spielverlegungen/Verschieberegeln verwalten"
 COM_SPORTSMANAGER_MANAGE_VENUES="Spielorte verwalten"
 COM_SPORTSMANAGER_MANAGE_TEAM_COMPETITIONS="Mannschaftswettbewerbe verwalten"
 COM_SPORTSMANAGER_MANAGE_PLAYER_STATISTICS="Spielerstastistiken verwalten"
@@ -810,7 +811,6 @@ COM_SPORTSMANAGER_APPLIED_FOR="Beantragt"
 COM_SPORTSMANAGER_DECLINED="Abgelehnt"
 COM_SPORTSMANAGER_DATE_DETAILS="Termin: Details"
 COM_SPORTSMANAGER_ADDITIONS="Zusätze"
-COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Weitere Informationen"
 COM_SPORTSMANAGER_PUBLIC_EMAIL="E-Mail öffentlich"
 COM_SPORTSMANAGER_EMAIL_WITH_CHANGES="E-Mail bei Änderungen"
 COM_SPORTSMANAGER_ACTION_TYPE="Aktionstyp"
@@ -886,6 +886,9 @@ COM_SPORTSMANAGER_INITIAL_APPOINTMENT_SUGGESTIONS="Initiale Terminvorschläg
 COM_SPORTSMANAGER_REQUESTING_TEAM="Beantragende Mannschaft"
 COM_SPORTSMANAGER_OPPONENT_TEAM="Gegnerische Mannschaft"
 COM_SPORTSMANAGER_AGAINST_PROPOSALS_ALLOWED="Gegensvorschläge zulässig"
+COM_SPORTSMANAGER_REASON_REQUIRED="Begründung erforderlich"
+COM_SPORTSMANAGER_CLUB_ENTITLEMENT="Berechtigung Vereine"
+COM_SPORTSMANAGER_ASSOCIATION_ENTITLEMENT="Berechtigung Verband"
 COM_SPORTSMANAGER_LEAD_TIME="Vorlaufzeit"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MINIMAL="Terminvorschläge minimal"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MAXIMUM="Terminvorschläge maximal"
@@ -1018,3 +1021,52 @@ COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS="Verschiebungen"
 COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP="Spielverschiebungen durch diese Mannschaft"
 COM_SPORTSMANAGER_GAME_RESULT_DELAYS="Verzögerung"
 COM_SPORTSMANAGER_USE_EMAIL_REMINDERS="Verwende Email Erinnerungen"
+COM_SPORTSMANAGER_RULEBOOKS="Regelwerke"
+COM_SPORTSMANAGER_RULEBOOK="Regelwerk"
+COM_SPORTSMANAGER_RULE_SHORT="SPO"
+COM_SPORTSMANAGER_FEE_SHORT="GO"
+COM_SPORTSMANAGER_RULE_LONG="Paragraph SPO"
+COM_SPORTSMANAGER_FEE_LONG="Paragraph GO"
+COM_SPORTSMANAGER_SELECT="Auswahl"
+COM_SPORTSMANAGER_NO_SELECT="keine Auswahl"
+COM_SPORTSMANAGER_REALLY_REMOVE_RULEBOOK="Willst Du dieses Regelwerk wirklich entfernen?"
+COM_SPORTSMANAGER_ADD_RULEBOOK="Regelwerk hinzufügen"
+COM_SPORTSMANAGER_DISCIPLINARY_FINES="Ordnungsstrafen"
+COM_SPORTSMANAGER_DISCIPLINARY_FINE="Ordnungsstrafe"
+COM_SPORTSMANAGER_ISSUE_DISCIPLINARY_FINES="Ordnungsstrafe ausstellen"
+COM_SPORTSMANAGER_EDIT_DISCIPLINARY_FINE="Ordnungsstrafe bearbeiten"
+COM_SPORTSMANAGER_SEND_DISCIPLINARY_FINE="Ordnungsstrafe versenden"
+COM_SPORTSMANAGER_REALLY_REMOVE_DISCIPLINARY_FINES="Willst Du diese Ordnungsstrafe wirklich entfernen?"
+COM_SPORTSMANAGER_VIOLATIONS="Verstöße"
+COM_SPORTSMANAGER_VIOLATION="Verstoß"
+COM_SPORTSMANAGER_ADD_VIOLATION="Verstoß hinzufügen"
+COM_SPORTSMANAGER_REALLY_REMOVE_VIOLATION="Willst Du diesen Verstoß wirklich entfernen?"
+COM_SPORTSMANAGER_VIOLATION_TEXT="Text"
+COM_SPORTSMANAGER_VIOLATION_ADD_TEXT="Zusatztext"
+COM_SPORTSMANAGER_FEE="Gebühr"
+COM_SPORTSMANAGER_ADD_FEE="Zusatzgebühr"
+COM_SPORTSMANAGER_SELECTABLE="Auswählbar"
+COM_SPORTSMANAGER_TEMPLATE="Vorlage"
+COM_SPORTSMANAGER_EMAIL_SUBJECT="Betreff"
+COM_SPORTSMANAGER_EMAIL_MESSAGE="Nachricht"
+COM_SPORTSMANAGER_EMAIL_TO="An"
+COM_SPORTSMANAGER_EMAIL_SEND="E-Mail senden"
+COM_SPORTSMANAGER_EMAIL_TEXT_TEMPLATE="Textvorlage"
+COM_SPORTSMANAGER_ISSUER="Aussteller"
+COM_SPORTSMANAGER_ISSUE_DATE="Ausstelldatum"
+COM_SPORTSMANAGER_SENDER="Sender"
+COM_SPORTSMANAGER_BILL_ISSUER="Rechnung erstellt"
+COM_SPORTSMANAGER_MULTIPLIER="Multiplikator"
+COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Weitere Angaben"
+COM_SPORTSMANAGER_EMAIL_WAS_SEND="Die E-Mail wurde erfolgreich versendet"
+COM_SPORTSMANAGER_EMAIL_WAS_NOT_SEND="Die E-Mail wurde nicht versendet"
+COM_SPORTSMANAGER_OLD_DATE="Alter Termin"
+COM_SPORTSMANAGER_NEW_DATE="Neuer Termin"
+COM_SPORTSMANAGER_REASON_GAME_APPOINTMENT="Verlegungsgrund"
+COM_SPORTSMANAGER_MATCH_RESCHEDULINGS="Spielverlegungen"
+COM_SPORTSMANAGER_MATCH_RESCHEDULING="Spielverlegung"
+COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="Bei Heimrechttausch gleichen Termin eintragen"
+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_TRAINING_DAYS="Trainingstage"

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

@@ -321,6 +321,7 @@ COM_SPORTSMANAGER_VIEW_LEAST_MEMBER_COUNT="Show least member count (teams)"
 COM_SPORTSMANAGER_SHOW_ORGANISATION="Show organisation (teams)"
 COM_SPORTSMANAGER_SHOW_MEMBER_COUNT="Show member column (teams)"
 COM_SPORTSMANAGER_SHOW_TOURNAMENT_BRACKET="Show Tournament Bracket"
+COM_SPORTSMANAGER_USE_DISCIPLINARY_FINE="Use disciplinary fine"
 COM_SPORTSMANAGER_PLAYER_DETAILS="Player details"
 COM_SPORTSMANAGER_PLAYER_LIST_DETAILS="Player list details"
 COM_SPORTSMANAGER_PLAYER_EDIT="Edit player data by organisation/club contacts"
@@ -361,8 +362,9 @@ COM_SPORTSMANAGER_PLAYERS_EXPORT_SPORT_SOFTWARE="Export players (Sport Software)
 COM_SPORTSMANAGER_CLEANUP_INACTIVE_PLAYERS="Cleanup inactive players"
 COM_SPORTSMANAGER_STATISTIK="Statistics"
 COM_SPORTSMANAGER_PLAYERS_ACTIVE="Players active"
-COM_SPORTSMANAGER_RESTRICTED_PLAYERS="Players restrited"
+COM_SPORTSMANAGER_RESTRICTED_PLAYERS="Players restricted"
 COM_SPORTSMANAGER_PLAYER_PASSIV="Players passive"
+COM_SPORTSMANAGER_PLAYER_UNATTACHED="Players unattached"
 COM_SPORTSMANAGER_MEN_ACTIVE="Male active"
 COM_SPORTSMANAGER_WOMEN_ACTIVE="Female active"
 COM_SPORTSMANAGER_JUNIOR_ACTIVE="Juniors active"
@@ -514,7 +516,6 @@ COM_SPORTSMANAGER_ADD_POINTS_TABLE="Add points table"
 COM_SPORTSMANAGER_ADD_FUNCTION="Add function"
 COM_SPORTSMANAGER_PARTICIPANT="Participants"
 COM_SPORTSMANAGER_FUNCTION="Function"
-COM_SPORTSMANAGER_MULTIPLIER="Multiplier"
 COM_SPORTSMANAGER_MAXIMUM="maximum"
 COM_SPORTSMANAGER_CONTRACTION="Contraction"
 COM_SPORTSMANAGER_ELIGIBLE_ORGANIZERS="Eligible for organisation"
@@ -575,7 +576,7 @@ COM_SPORTSMANAGER_PRIVATE_PLAYER_DATA="View privat player information in club an
 COM_SPORTSMANAGER_ASSOCIATIONS_MEMBERSHIPS_MANAGE="Manage clubs and memberships"
 COM_SPORTSMANAGER_MANAGE_CLASSIFICATIONS="Manage classifications"
 COM_SPORTSMANAGER_MANAGE_TEAM_PLANS="Manage team plans"
-COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Manage postpone rules"
+COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Manage match rescheduling/postpone rules"
 COM_SPORTSMANAGER_MANAGE_VENUES="Manage venues"
 COM_SPORTSMANAGER_MANAGE_TEAM_COMPETITIONS="Manage team competitions"
 COM_SPORTSMANAGER_MANAGE_PLAYER_STATISTICS="Manage player statitics"
@@ -810,7 +811,6 @@ COM_SPORTSMANAGER_APPLIED_FOR="Applied"
 COM_SPORTSMANAGER_DECLINED="Declined"
 COM_SPORTSMANAGER_DATE_DETAILS="Event: Details"
 COM_SPORTSMANAGER_ADDITIONS="Additions"
-COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Additional information"
 COM_SPORTSMANAGER_PUBLIC_EMAIL="E-mail public"
 COM_SPORTSMANAGER_EMAIL_WITH_CHANGES="E-mail for changes"
 COM_SPORTSMANAGER_ACTION_TYPE="Action type"
@@ -886,6 +886,9 @@ COM_SPORTSMANAGER_INITIAL_APPOINTMENT_SUGGESTIONS="Initial appointment suggestio
 COM_SPORTSMANAGER_REQUESTING_TEAM="Requesting team"
 COM_SPORTSMANAGER_OPPONENT_TEAM="Opponent team"
 COM_SPORTSMANAGER_AGAINST_PROPOSALS_ALLOWED="Against proposals allowed"
+COM_SPORTSMANAGER_REASON_REQUIRED="Reason required"
+COM_SPORTSMANAGER_CLUB_ENTITLEMENT="Club entitlement"
+COM_SPORTSMANAGER_ASSOCIATION_ENTITLEMENT="Association_entitlement"
 COM_SPORTSMANAGER_LEAD_TIME="Lead time"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MINIMAL="Appointment proposals minimal"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MAXIMUM="Appointment proposals maximum"
@@ -949,8 +952,10 @@ COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_MARK_NO=" (Kein Nichtraucherschutz)"
 COM_SPORTSMANAGER_POINTS_TABLE="Points table"
 COM_SPORTSMANAGER_EVALUATION="Auswertung"
 COM_SPORTSMANAGER_FUNCTION_DESCRIPTION="Variables: n = number of participants, p = place, m = multiplier of rating and in doubles possibly additionally reduced rating<br />Functions: +, -, *, /, round(x), pow(x), if(a > b, x, y), min(x, y), max(x, y), log(x), ln(x), logn(b, x)<br />VerteilungR(r, p, n, m) := max(round((((m * r - 1) * (-log(p / n) * (1 - (p / n)))) / (-log(1 / n) * (1 - (1 / n)))) + 1), 1)<br />Verteilung(r, p, n, m) := max(round(m * round((((r - 1) * (-log(p / n) * (1 - (p / n)))) / (-log(1 / n) * (1 - (1 / n)))) + 1)), 1)<br /><br />The functions VerteilungR() and Verteilung() distribute points for place 1 (r) descending to the individual places (p) of the number of participants (n).<br />VerteilungR() applies the multiplier (m) to the points for 1st place and then distributes down to 1 point for the last place.<br />Verteilung() applies the multiplier (m) to the points after the calculation, i.e. the last place receives 1 * m points."
-COM_SPORTSMANAGER_LIZENZ="License"
+COM_SPORTSMANAGER_RANK="Rank"
 
+; Edit Player
+COM_SPORTSMANAGER_LIZENZ="License"
 COM_SPORTSMANAGER_ARIA_LABEL_MATCHDAY_SELECT="Choose a match day"
 COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_DAY="Choose the day of the match proposal"
 COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MONTH="Choose the month of the match proposal"
@@ -1016,3 +1021,52 @@ COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS="Shifts"
 COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP="Game shifts caused by this team"
 COM_SPORTSMANAGER_GAME_RESULT_DELAYS="Delay"
 COM_SPORTSMANAGER_USE_EMAIL_REMINDERS="Use email reminders"
+COM_SPORTSMANAGER_RULEBOOKS="Rulebooks"
+COM_SPORTSMANAGER_RULEBOOK="Rulebook"
+COM_SPORTSMANAGER_RULE_SHORT="Rule"
+COM_SPORTSMANAGER_FEE_SHORT="Section fees"
+COM_SPORTSMANAGER_RULE_LONG="Section rules"
+COM_SPORTSMANAGER_FEE_LONG="Fee"
+COM_SPORTSMANAGER_SELECT="Select"
+COM_SPORTSMANAGER_NO_SELECT="No selection"
+COM_SPORTSMANAGER_REALLY_REMOVE_RULEBOOK="Do you really want to remove this rulebook?"
+COM_SPORTSMANAGER_ADD_RULEBOOK="Add rulebook"
+COM_SPORTSMANAGER_DISCIPLINARY_FINES="Disciplinary fines"
+COM_SPORTSMANAGER_ISSUE_DISCIPLINARY_FINES="Issue disciplinary fines"
+COM_SPORTSMANAGER_ISSUE_DISCIPLINARY_FINE="Issue disciplinary fine"
+COM_SPORTSMANAGER_EDIT_DISCIPLINARY_FINE="Edit issue disciplinary fine"
+COM_SPORTSMANAGER_SEND_DISCIPLINARY_FINE="Send issue disciplinary fine"
+COM_SPORTSMANAGER_REALLY_REMOVE_DISCIPLINARY_FINES="Do you really want to remove this Issue disciplinary fine?"
+COM_SPORTSMANAGER_VIOLATIONS="Violations"
+COM_SPORTSMANAGER_VIOLATION="Violation"
+COM_SPORTSMANAGER_ADD_VIOLATION="Add violation"
+COM_SPORTSMANAGER_REALLY_REMOVE_VIOLATION="Do you really want to remove this violation?"
+COM_SPORTSMANAGER_VIOLATION_TEXT="Text"
+COM_SPORTSMANAGER_VIOLATION_ADD_TEXT="Additional text"
+COM_SPORTSMANAGER_FEE="Fee"
+COM_SPORTSMANAGER_ADD_FEE="Additional Fee"
+COM_SPORTSMANAGER_SELECTABLE="Selectable"
+COM_SPORTSMANAGER_TEMPLATE="Template"
+COM_SPORTSMANAGER_EMAIL_SUBJECT="Subject"
+COM_SPORTSMANAGER_EMAIL_MESSAGE="Message"
+COM_SPORTSMANAGER_EMAIL_TO="to"
+COM_SPORTSMANAGER_EMAIL_SEND="Send E-Mail"
+COM_SPORTSMANAGER_EMAIL_TEXT_TEMPLATE="Text template"
+COM_SPORTSMANAGER_ISSUER="Issuer"
+COM_SPORTSMANAGER_SENDER="Sender"
+COM_SPORTSMANAGER_ISSUE_DATE="Issue date"
+COM_SPORTSMANAGER_BILL_ISSUER="Bill issuer"
+COM_SPORTSMANAGER_MULTIPLIER="Multiplier"
+COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Additional information"
+COM_SPORTSMANAGER_EMAIL_WAS_SEND="E-Mail was succesfully sent"
+COM_SPORTSMANAGER_EMAIL_WAS_NOT_SEND="E-Mail was not sent"
+COM_SPORTSMANAGER_OLD_DATE="Old Date"
+COM_SPORTSMANAGER_NEW_DATE="New Date"
+COM_SPORTSMANAGER_REASON_GAME_APPOINTMENT="Appointment reason"
+COM_SPORTSMANAGER_MATCH_RESCHEDULINGS="Match reschedulings"
+COM_SPORTSMANAGER_MATCH_RESCHEDULING="Match rescheduling"
+COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="If home advantage is swapped, enter the same date"
+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"

src/structure/script.php

@@ -670,6 +670,9 @@ return new class () implements InstallerScriptInterface
 		. "\n  `ortsname` varchar(30) DEFAULT NULL,"
 		. "\n  `ortsteil` varchar(30) DEFAULT NULL,"
 		. "\n  `url` varchar(150) DEFAULT NULL,"
+		. "\n  `telefon` varchar(64) DEFAULT NULL,"
+		. "\n  `email` varchar(64) DEFAULT NULL,"
+		. "\n  `ruhetage` varchar(64) DEFAULT NULL,"
 		. "\n  `beschreibung` varchar(500) DEFAULT NULL,"
 		. "\n  `status` tinyint(1) NOT NULL DEFAULT '0',"
 		. "\n  PRIMARY KEY (`spielort_id`)"
@@ -692,6 +695,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `heimspiel_wochentag` tinyint(4) DEFAULT NULL,"
 		. "\n  `heimspiel_uhrzeit` smallint(6) DEFAULT NULL,"
 		. "\n  `heimspielort_id` int(11) DEFAULT NULL,"
+		. "\n  `trainingstage` varchar(64) DEFAULT NULL,"
 		. "\n  `nichtraucherschutz` tinyint(4) DEFAULT '0',"
 		. "\n  `platz` smallint(6) DEFAULT NULL,"
 		. "\n  `gesamtpunkte` float(6,2) DEFAULT NULL,"
@@ -1035,6 +1039,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `saison_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `veranstalter_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `bezeichnung` varchar(50) DEFAULT NULL,"
+		. "\n  `regelwerke_id` INT(11) NOT NULL DEFAULT '0',"
 		. "\n  `modus_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `verschieberegel_id` int(11) NOT NULL DEFAULT '0',"
 		. "\n  `tabellenwertung` tinyint(4) NOT NULL DEFAULT '0',"
@@ -1104,6 +1109,9 @@ return new class () implements InstallerScriptInterface
 		. "\n  `termine_minimal` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `termine_maximal` tinyint(4) NOT NULL DEFAULT '0',"
 		. "\n  `ablehnen` tinyint(1) NOT NULL DEFAULT '0',"
+		. "\n  `begruendung_erforderlich` int(1) NOT NULL DEFAULT 0,"
+		. "\n  `vereine_berechtigt` int(1) NOT NULL DEFAULT 1,"
+		. "\n  `verband_berechtigt` int(1) NOT NULL DEFAULT 0,"
 		. "\n  PRIMARY KEY (`verschieberegel_id`)"
 		. "\n) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
 		$db->setQuery( $query );
@@ -1118,7 +1126,69 @@ 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 = '108';";
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_regelwerke` ("
+		. "\n `regelwerke_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n `regelwerk` varchar(32) NOT NULL,"
+		. "\n PRIMARY KEY (`regelwerke_id`),"
+		. "\n UNIQUE KEY `regelwerk` (`regelwerk`)"
+		. "\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,"
+		. "\n `paragraph_spo` varchar(32) NOT NULL DEFAULT '',"
+		. "\n `paragraph_go` varchar(32) NOT NULL DEFAULT '',"
+		. "\n `verstoss` varchar(64) NOT NULL DEFAULT '',"
+		. "\n `haupttext` text NOT NULL,"
+		. "\n `zusatztext` text NOT NULL,"
+		. "\n `gebuehr` smallint(3) NOT NULL DEFAULT 0,"
+		. "\n `zusatzgebuehr` smallint(2) NOT NULL DEFAULT 0,"
+		. "\n `zur_auswahl` tinyint(1) NOT NULL DEFAULT 1,"
+		. "\n PRIMARY KEY (`verstoesse_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_ordnungsstrafen` ("
+		. "\n `ordnungsstrafen_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n `verstoesse_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `begegnung_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `team_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `aussteller_id` int(11) NOT NULL DEFAULT 0,"
+		. "\n `ausstelldatum` datetime NOT NULL DEFAULT current_timestamp(),"
+		. "\n `versender_id` int(11) DEFAULT NULL,"
+		. "\n `versendedatum` datetime DEFAULT NULL,"
+		. "\n `rechnungssteller_id` int(11) DEFAULT NULL,"
+		. "\n `rechnungsdatum` datetime DEFAULT NULL,"
+		. "\n `multiplikator` tinyint(1) NOT NULL DEFAULT 1,"
+		. "\n `weitere_angaben` text NOT NULL,"
+		. "\n PRIMARY KEY (`ordnungsstrafen_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_email_vorlagen` ("
+		. "\n `email_vorlagen_id` int(11) NOT NULL AUTO_INCREMENT,"
+		. "\n `vorlage` varchar(64) NOT NULL,"
+		. "\n `betreff` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `von` varchar(64) NOT NULL DEFAULT '',"
+		. "\n `an` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `cc` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `bcc` varchar(256) NOT NULL DEFAULT '',"
+		. "\n `email_text` text NOT NULL,"
+		. "\n PRIMARY KEY (`email_vorlagen_id`),"
+		. "\n UNIQUE KEY `vorlage` (`vorlage`)"
+		. "\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';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
@@ -1150,6 +1220,10 @@ return new class () implements InstallerScriptInterface
 		$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)); }
@@ -1161,6 +1235,14 @@ return new class () implements InstallerScriptInterface
 		$query = "INSERT INTO #__sportsmanager_verschieberegel (bezeichnung, initial_ohne_termin, keine_gegenvorschlaege, vorlaufzeit_tage, termine_minimal, termine_maximal, ablehnen)"
 		. "\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)); }
+
+		$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"
@@ -1650,5 +1732,21 @@ 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)); }
 	}
 };