diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 59332f7..6d094d0 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -62,7 +62,8 @@ function detectFileEncoding(string $filename): string { } // Verarbeitung von Vorlagen -function renderTemplate($template, $vars = []) { +function renderTemplate($template, $vars = []): string +{ // 1. IF_NOT mit optionalem ELSE $template = preg_replace_callback( @@ -70,7 +71,7 @@ function renderTemplate($template, $vars = []) { function($m) use ($vars) { $var = $m[1]; $ifText = $m[2]; - $elseText = isset($m[5]) ? $m[5] : ''; + $elseText = $m[5] ?? ''; if (empty($vars[$var])) { return $ifText; @@ -87,7 +88,7 @@ function renderTemplate($template, $vars = []) { function($m) use ($vars) { $var = $m[1]; $ifText = $m[2]; - $elseText = isset($m[5]) ? $m[5] : ''; + $elseText = $m[5] ?? ''; if (!empty($vars[$var])) { return $ifText; @@ -6172,10 +6173,11 @@ function adminOrdnungsstrafeMailen(): void $rows = loadObjectList($db, $query); $ordnungsstrafe = $rows[0]; - $query = "SELECT * FROM #__sportsmanager_vereinsansprechpartner" + $query = "SELECT nachname, vorname, email" + . "\n FROM #__sportsmanager_vereinsansprechpartner" . "\n WHERE verein_id = '" . $rows[0]->verein_id . "'" . "\n GROUP BY email" - . "\n ORDER BY vereinsansprechpartner_id;"; + . "\n ORDER BY nachname, vorname;"; $vereinsansprechpartner = loadObjectList($db, $query); $var["Ansprechpartner"] = ""; @@ -6224,7 +6226,7 @@ function adminOrdnungsstrafeMailen(): void HTML_sportsmanager_admin::adminMailto($to,$cc,$bcc,$subject,$message,$backtomail,$backtosender,$vorlage); } -function sendJoomlaMail() +function sendJoomlaMail(): void { $db = getDatabase(); $jInput = Factory::getContainer()->get(SiteApplication::class)->input; @@ -6236,7 +6238,6 @@ function sendJoomlaMail() $bcc = $db->escape(trim($jInput->get('bcc', '', 'RAW'))); $subject = $db->escape(trim($jInput->get('betreff', '', 'RAW'))); $body = nl2br(trim($jInput->get('nachricht', '', 'RAW'))); - $isHtml = true; // Joomla From-Adresse aus Konfiguration $fromEmail = $config->get('mailfrom'); @@ -6277,7 +6278,7 @@ function sendJoomlaMail() // Betreff und Body $mailer->setSubject($subject); $mailer->setBody($body); - $mailer->isHtml($isHtml); + $mailer->isHtml(true); // Senden $result = $mailer->send(); @@ -6295,7 +6296,7 @@ function adminOrdnungsstrafen(): void $db = getDatabase(); $jInput = Factory::getContainer()->get(SiteApplication::class)->input; - if (!benutzerZugriff("mannschaftswettbewerb_aendern") && !benutzerVeranstaltungModerator($veranstaltungId)) + if (!benutzerZugriff("mannschaftswettbewerb_aendern")) keinZugriff(); $filter['saison'] = $jInput->get('filter_saison_id', 0, 'INT'); @@ -6372,12 +6373,11 @@ function adminEditOrdnungsstrafe(): void $db = getDatabase(); $jInput = Factory::getContainer()->get(SiteApplication::class)->input; - if (!benutzerZugriff("mannschaftswettbewerb_aendern") && !benutzerVeranstaltungModerator($veranstaltungId)) + if (!benutzerZugriff("mannschaftswettbewerb_aendern")) keinZugriff(); $id = $jInput->get('id', 0, 'INT'); $begegnungid = $jInput->get('begegnungid', 0, 'INT'); - $veranstaltungid = $jInput->get('veranstaltungid', 0, 'INT'); $user_id = isExternalDatabase() ? 0 : (isJson() ? getUserID() : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id); if ($id == 0){ @@ -6424,7 +6424,7 @@ function adminEditOrdnungsstrafe(): void $query .= "ORDER BY t1.regelwerke_id, t1.verstoesse_id;"; $verstoesse = loadObjectList($db, $query); - HTML_sportsmanager_admin::adminEditOrdnungsstrafe($row,$begegnungen[0],$teams,$verstoesse,$aussteller[0]); + HTML_sportsmanager_admin::adminEditOrdnungsstrafe($row,$begegnungen[0],$verstoesse,$aussteller[0]); } #[NoReturn] function adminSaveOrdnungsstrafe(): void @@ -6432,7 +6432,7 @@ function adminEditOrdnungsstrafe(): void $db = getDatabase(); $jInput = Factory::getContainer()->get(SiteApplication::class)->input; - if (!benutzerZugriff("mannschaftswettbewerb_aendern") && !benutzerVeranstaltungModerator($veranstaltungId)) + if (!benutzerZugriff("mannschaftswettbewerb_aendern")) keinZugriff(); if ($jInput->get('cancel', false, 'BOOL')) { @@ -6449,7 +6449,6 @@ function adminEditOrdnungsstrafe(): void $ausstelldatum = $db->escape(trim($jInput->get('ausstelldatum', '', 'RAW'))); $multiplikator = $jInput->get('multiplikator', 0, 'INT'); $weitere_angaben = $db->escape(trim($jInput->get('weitere_angaben', '', 'RAW'))); - $status = $db->escape($jInput->get('status', '', 'RAW')); if ($jInput->get('save', false, 'BOOL')) { if ($id == 0) { @@ -6474,8 +6473,8 @@ function adminEditOrdnungsstrafe(): void redirectSportsManagerURL('&task=admin_ordnungsstrafen&filter_saison_id='.$filter_saison_id); } + $query = ""; if ($jInput->get('set_versender', '', 'RAW') == 'set') { - echo "Set Versender"; $query = "UPDATE #__sportsmanager_ordnungsstrafen" . "\n SET versender_id = '$user_id'," . "\n versendedatum = CURTIME()" @@ -6490,7 +6489,6 @@ function adminEditOrdnungsstrafe(): void . "\n WHERE ordnungsstrafen_id = $id;"; } if ($jInput->get('set_rechnung', '', 'RAW') == 'set') { - echo "Set Versender"; $query = "UPDATE #__sportsmanager_ordnungsstrafen" . "\n SET rechnungssteller_id = '$user_id'," . "\n rechnungsdatum = CURTIME()" @@ -6502,6 +6500,7 @@ function adminEditOrdnungsstrafe(): void . "\n rechnungsdatum = NULL" . "\n WHERE ordnungsstrafen_id = $id;"; } + $db->setQuery($query); if (!$db->execute()) { die($db->stderr(true)); @@ -6514,7 +6513,7 @@ function adminEditOrdnungsstrafe(): void $db = getDatabase(); $jInput = Factory::getContainer()->get(SiteApplication::class)->input; - if (!benutzerZugriff("mannschaftswettbewerb_aendern") && !benutzerVeranstaltungModerator($veranstaltungId)) + if (!benutzerZugriff("mannschaftswettbewerb_aendern")) keinZugriff(); $id = $jInput->get('id', 0, 'INT'); @@ -6567,7 +6566,7 @@ function adminEditOrdnungsstrafe(): void $query .= "\n ORDER BY ordnungsstrafen_id"; $rows = loadObjectList($db, $query); - $dateiname .= "Ordnungsstrafen.csv"; + $dateiname = "Ordnungsstrafen.csv"; $dateiname = bereinigterDateiname($dateiname); ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind Header("Content-Type: text/x-csv"); @@ -6715,6 +6714,7 @@ function adminVerstoesse(): void . "\n FROM #__sportsmanager_regelwerke" . "\n ORDER BY regelwerke_id"; $liste = loadObjectList($db, $query); + $regelwerke = []; foreach($liste as $value){ $regelwerke[$value->regelwerke_id] = $value->regelwerk; } @@ -6844,7 +6844,6 @@ function adminSaveEmailVorlage(): void { $db = getDatabase(); $jInput = Factory::getContainer()->get(SiteApplication::class)->input; - $Fehlertext = ""; if (!benutzerZugriff("benutzerVeranstalterModerator")) keinZugriff(); diff --git a/src/structure/components/com_sportsmanager/database/update.php b/src/structure/components/com_sportsmanager/database/update.php index b7ae87d..c45acc4 100644 --- a/src/structure/components/com_sportsmanager/database/update.php +++ b/src/structure/components/com_sportsmanager/database/update.php @@ -5452,8 +5452,8 @@ function updateDatabase(): void . "\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 DEFAULT ''," - . "\n `zusatztext` text 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," @@ -5474,7 +5474,7 @@ function updateDatabase(): void . "\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 DEFAULT ''" + . "\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 ); @@ -5488,7 +5488,7 @@ function updateDatabase(): void . "\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 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;"; diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 2ef0f95..0173690 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -6772,7 +6772,8 @@ class HTML_sportsmanager_admin
@@ -7023,7 +7024,7 @@ class HTML_sportsmanager_admin } } - static function adminEditOrdnungsstrafe($row,$begegnung,$teams,$verstoesse,$aussteller): void + static function adminEditOrdnungsstrafe($row,$begegnung,$verstoesse,$aussteller): void { global $params; ?> @@ -7358,7 +7359,7 @@ class HTML_sportsmanager_admin enctype="multipart/form-data">
- +
diff --git a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini index 5c1250f..647b965 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -516,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" @@ -812,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" diff --git a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini index 30705cf..eddda13 100644 --- a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini +++ b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini @@ -516,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" @@ -812,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" diff --git a/src/structure/script.php b/src/structure/script.php index 7bc12fc..7ec37e9 100644 --- a/src/structure/script.php +++ b/src/structure/script.php @@ -1134,8 +1134,8 @@ return new class () implements InstallerScriptInterface . "\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 DEFAULT ''," - . "\n `zusatztext` text 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," @@ -1156,7 +1156,7 @@ return new class () implements InstallerScriptInterface . "\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 DEFAULT ''" + . "\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 ); @@ -1170,7 +1170,7 @@ return new class () implements InstallerScriptInterface . "\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 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;";