mirror of
https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git
synced 2026-06-10 06:27:52 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b68d8a5ed | |||
| 5843fda2d6 | |||
| 511c17468c | |||
| 6f33599fd9 | |||
| aac4c1458f | |||
| f39ade0e9d |
@@ -0,0 +1,22 @@
|
||||
name: Nightly DTFB Player Sync
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 2 * * *' # Every night at 2:00 AM UTC
|
||||
workflow_dispatch: # Allow manual trigger from GitHub
|
||||
|
||||
jobs:
|
||||
sync:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Trigger DTFB Sync
|
||||
run: |
|
||||
response=$(curl -s -o /dev/null -w "%{http_code}" \
|
||||
-X POST \
|
||||
-H "Authorization: Bearer ${{ secrets.DTFB_SYNC_KEY }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${{ secrets.DTFB_SYNC_TRIGGER_URL }}")
|
||||
if [ "$response" != "200" ]; then
|
||||
echo "Sync failed with HTTP $response"
|
||||
exit 1
|
||||
fi
|
||||
echo "Sync triggered successfully"
|
||||
@@ -817,6 +817,7 @@ function adminEinstellungen(): void
|
||||
$spielerimport_persoenliche_daten_vorauswahl = $jInput->get('spielerimport_persoenliche_daten_vorauswahl', 0, 'INT');
|
||||
|
||||
$api_push_key = $jInput->get('api_push_key', '', 'RAW');
|
||||
$dtfb_sync_url = $db->escape(trim($jInput->get('dtfb_sync_url', '', 'RAW')));
|
||||
|
||||
$query = "REPLACE #__sportsmanager_einstellungen"
|
||||
. "\n SET name = 'verbands_kuerzel'"
|
||||
@@ -950,15 +951,13 @@ function adminEinstellungen(): void
|
||||
die($db->stderr(true));
|
||||
}
|
||||
|
||||
redirectSportsManagerURL('&task=admin_uebersicht');
|
||||
}
|
||||
$query = "REPLACE #__sportsmanager_einstellungen SET name = 'dtfb_sync_url', wert = '$dtfb_sync_url'";
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
die($db->stderr(true));
|
||||
}
|
||||
|
||||
function adminSportshub(): void
|
||||
{
|
||||
ini_set('memory_limit', '1024M');
|
||||
$db = getDatabase(true);
|
||||
$exporter = new SMExporter($db);
|
||||
$exporter->run();
|
||||
redirectSportsManagerURL('&task=admin_uebersicht');
|
||||
}
|
||||
|
||||
function adminDatenbank(): void
|
||||
@@ -3427,6 +3426,50 @@ function adminExportSpielerForm(): void
|
||||
die();
|
||||
}
|
||||
|
||||
#[NoReturn] function adminSyncSpielerToDtfb(): void
|
||||
{
|
||||
$jInput = Factory::getContainer()->get(SiteApplication::class)->input;
|
||||
|
||||
if (!benutzerZugriff("spieler_aendern")) {
|
||||
keinZugriff();
|
||||
}
|
||||
|
||||
if ($jInput->get('cancel', false, 'BOOL')) {
|
||||
redirectSportsManagerURL('&task=admin_spieler');
|
||||
}
|
||||
|
||||
$csvData = syncExportSpielerCSV();
|
||||
if (empty($csvData)) {
|
||||
redirectSportsManagerURL('&task=admin_spieler', 'Keine Spieler zum Synchronisieren gefunden.');
|
||||
}
|
||||
|
||||
$res = syncPushToDtfb($csvData);
|
||||
|
||||
// Log the sync
|
||||
syncLogEntry(
|
||||
'push',
|
||||
'manual',
|
||||
$res['success'] ? 'success' : 'error',
|
||||
$res['spieler_count'] ?? 0,
|
||||
$res['spieler_updated'] ?? 0,
|
||||
$res['spieler_added'] ?? 0,
|
||||
$res['message'] ?? '',
|
||||
''
|
||||
);
|
||||
|
||||
if ($res['success']) {
|
||||
$msg = sprintf(
|
||||
'Erfolgreich mit DTFB synchronisiert! Spieler gesamt: %d, aktualisiert: %d, neu hinzugefügt: %d.',
|
||||
$res['spieler_count'] ?? 0,
|
||||
$res['spieler_updated'] ?? 0,
|
||||
$res['spieler_added'] ?? 0
|
||||
);
|
||||
redirectSportsManagerURL('&task=admin_spieler', $msg);
|
||||
} else {
|
||||
redirectSportsManagerURL('&task=admin_spieler', 'Sync-Fehler: ' . $res['message']);
|
||||
}
|
||||
}
|
||||
|
||||
#[NoReturn] function adminExportSpielerSport(): void
|
||||
{
|
||||
$db = getDatabase();
|
||||
@@ -14260,7 +14303,7 @@ function adminImportTurnierdisziplinMeldungenSpieleForm(): void
|
||||
HTML_sportsmanager_admin::adminImportTurnierdisziplinMeldungenSpieleForm($row, $veranstalter);
|
||||
}
|
||||
|
||||
function adminLoeschenTurnierdisziplinMeldungenSpiele($id): void
|
||||
#[NoReturn] function adminLoeschenTurnierdisziplinMeldungenSpiele($id): void
|
||||
{
|
||||
$db = getDatabase();
|
||||
global $_FILES;
|
||||
|
||||
@@ -5709,7 +5709,6 @@ function updateDatabase(): void
|
||||
}
|
||||
|
||||
if ($datenbank_version < 120) {
|
||||
|
||||
$columns = $db->getTableColumns('#__sportsmanager_teamspiel_modus');
|
||||
if (!array_key_exists('spiele_in_spielerstatistik', $columns)){
|
||||
$query = "ALTER TABLE `#__sportsmanager_teamspiel_modus`"
|
||||
@@ -5741,6 +5740,41 @@ function updateDatabase(): void
|
||||
}
|
||||
}
|
||||
|
||||
if ($datenbank_version < 121) {
|
||||
$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_sync_log` ("
|
||||
. "\n `sync_id` INT(11) NOT NULL AUTO_INCREMENT,"
|
||||
. "\n `sync_timestamp` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,"
|
||||
. "\n `sync_direction` ENUM('push', 'receive') NOT NULL,"
|
||||
. "\n `sync_trigger` ENUM('manual', 'cron', 'api') NOT NULL,"
|
||||
. "\n `sync_status` ENUM('success', 'error') NOT NULL,"
|
||||
. "\n `spieler_count` INT(11) DEFAULT 0,"
|
||||
. "\n `spieler_updated` INT(11) DEFAULT 0,"
|
||||
. "\n `spieler_added` INT(11) DEFAULT 0,"
|
||||
. "\n `message` TEXT,"
|
||||
. "\n `details` TEXT,"
|
||||
. "\n PRIMARY KEY (`sync_id`),"
|
||||
. "\n INDEX `idx_timestamp` (`sync_timestamp`)"
|
||||
. "\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
die($db->stderr(true));
|
||||
}
|
||||
|
||||
$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'dtfb_sync_url', wert = '';";
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
die($db->stderr(true));
|
||||
}
|
||||
|
||||
$query = "UPDATE #__sportsmanager_einstellungen"
|
||||
. "\n SET wert = '121'"
|
||||
. "\n WHERE name = 'datenbank_version'";
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
die($db->stderr(true));
|
||||
}
|
||||
}
|
||||
|
||||
if ($termin_aktionen_email_setzen) {
|
||||
$query = "SELECT aktion_user_id, termin_aktion_id"
|
||||
. "\n FROM #__sportsmanager_termin_aktion";
|
||||
|
||||
@@ -43,8 +43,8 @@ require_once JPATH_SITE . '/components/com_sportsmanager/views/sportsmanager/vie
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/views/sportsmanager/view_ticker.php';
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/util/image.php';
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/util/email.php';
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/util/export.php';
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/database/update.php'; // will also include init.php and util.php
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/sync.php';
|
||||
|
||||
initDatabase();
|
||||
updateDatabase();
|
||||
@@ -75,6 +75,10 @@ if ($task == "spielerbild") {
|
||||
terminDokument();
|
||||
} else if ($task == "spieler_details") {
|
||||
spielerDetails();
|
||||
} else if ($task === 'api_sync_spieler_receive') {
|
||||
apiSyncSpielerReceive();
|
||||
} else if ($task === 'api_sync_spieler_trigger') {
|
||||
apiSyncSpielerTrigger();
|
||||
} else if ($task !== null && str_starts_with($task, "admin_")) {
|
||||
// in some cases there are no breaks needed due to no return from method
|
||||
switch ($task) {
|
||||
@@ -84,9 +88,6 @@ if ($task == "spielerbild") {
|
||||
case 'admin_einstellungen_save':
|
||||
adminSaveEinstellungen();
|
||||
break;
|
||||
case 'admin_sportshub':
|
||||
adminSportshub();
|
||||
break;
|
||||
case 'admin_datenbank':
|
||||
adminDatenbank();
|
||||
break;
|
||||
@@ -138,6 +139,9 @@ if ($task == "spielerbild") {
|
||||
case 'admin_spieler_export_sport':
|
||||
adminExportSpielerSport();
|
||||
break;
|
||||
case 'admin_spieler_sync_dtfb':
|
||||
adminSyncSpielerToDtfb();
|
||||
break;
|
||||
case 'admin_spieler_remove_inaktive_form':
|
||||
adminRemoveInaktiveSpielerForm();
|
||||
break;
|
||||
|
||||
@@ -0,0 +1,899 @@
|
||||
<?php
|
||||
/**
|
||||
* Sports Manager Sync Extension
|
||||
*/
|
||||
|
||||
use Joomla\CMS\Application\SiteApplication;
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Language\Text;
|
||||
|
||||
defined("_JEXEC") or die();
|
||||
|
||||
/**
|
||||
* Gets the Bearer token from the Authorization header.
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
function syncGetBearerToken(): ?string
|
||||
{
|
||||
$headers = null;
|
||||
if (isset($_SERVER['Authorization'])) {
|
||||
$headers = trim($_SERVER["Authorization"]);
|
||||
} elseif (isset($_SERVER['HTTP_AUTHORIZATION'])) {
|
||||
$headers = trim($_SERVER["HTTP_AUTHORIZATION"]);
|
||||
} elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
|
||||
$headers = trim($_SERVER["REDIRECT_HTTP_AUTHORIZATION"]);
|
||||
} elseif (function_exists('apache_request_headers')) {
|
||||
$requestHeaders = apache_request_headers();
|
||||
$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
|
||||
if (isset($requestHeaders['Authorization'])) {
|
||||
$headers = trim($requestHeaders['Authorization']);
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($headers)) {
|
||||
if (preg_match('/Bearer\s(\S+)/i', $headers, $matches)) {
|
||||
return $matches[1];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Logs a sync event in the database.
|
||||
*
|
||||
* @param string $direction ('push' or 'receive')
|
||||
* @param string $trigger ('manual', 'cron', or 'api')
|
||||
* @param string $status ('success' or 'error')
|
||||
* @param int $spieler_count
|
||||
* @param int $spieler_updated
|
||||
* @param int $spieler_added
|
||||
* @param string $message
|
||||
* @param string $details
|
||||
*/
|
||||
function syncLogEntry(string $direction, string $trigger, string $status, int $spieler_count, int $spieler_updated, int $spieler_added, string $message, string $details = ''): void
|
||||
{
|
||||
try {
|
||||
$db = getDatabase();
|
||||
$query = "INSERT INTO #__sportsmanager_sync_log"
|
||||
. "\n SET sync_timestamp = NOW(),"
|
||||
. "\n sync_direction = '" . $db->escape($direction) . "',"
|
||||
. "\n sync_trigger = '" . $db->escape($trigger) . "',"
|
||||
. "\n sync_status = '" . $db->escape($status) . "',"
|
||||
. "\n spieler_count = " . intval($spieler_count) . ","
|
||||
. "\n spieler_updated = " . intval($spieler_updated) . ","
|
||||
. "\n spieler_added = " . intval($spieler_added) . ","
|
||||
. "\n message = '" . $db->escape($message) . "',"
|
||||
. "\n details = '" . $db->escape($details) . "'";
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
} catch (Exception $e) {
|
||||
error_log("Failed to write sync log: " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns HTML displaying the status of the last sync operation.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function syncGetLastStatus(): string
|
||||
{
|
||||
try {
|
||||
$db = getDatabase();
|
||||
$query = "SELECT * FROM #__sportsmanager_sync_log ORDER BY sync_id DESC LIMIT 1";
|
||||
$rows = loadObjectList($db, $query);
|
||||
if (count($rows) === 0) {
|
||||
return "Noch nie synchronisiert";
|
||||
}
|
||||
$row = $rows[0];
|
||||
|
||||
$statusClass = $row->sync_status === 'success' ? 'uk-text-success' : 'uk-text-danger';
|
||||
$statusText = $row->sync_status === 'success' ? 'Erfolgreich' : 'Fehlgeschlagen';
|
||||
$directionText = $row->sync_direction === 'push' ? 'Export (Push)' : 'Import (Receive)';
|
||||
$triggerText = $row->sync_trigger === 'manual' ? 'Manuell' : ($row->sync_trigger === 'cron' ? 'Cron' : 'API');
|
||||
|
||||
$stats = "";
|
||||
if ($row->sync_status === 'success') {
|
||||
$stats = sprintf(
|
||||
" (Spieler gesamt: %d, Aktualisiert: %d, Hinzugefügt: %d)",
|
||||
$row->spieler_count,
|
||||
$row->spieler_updated,
|
||||
$row->spieler_added
|
||||
);
|
||||
} else {
|
||||
$stats = " (Fehler: " . htmlspecialchars($row->message) . ")";
|
||||
}
|
||||
|
||||
return sprintf(
|
||||
"<span class='%s'><strong>%s</strong></span> am %s via %s / %s%s",
|
||||
$statusClass,
|
||||
$statusText,
|
||||
date('d.m.Y H:i:s', strtotime($row->sync_timestamp)),
|
||||
$directionText,
|
||||
$triggerText,
|
||||
$stats
|
||||
);
|
||||
} catch (Exception $e) {
|
||||
return "Noch nie synchronisiert";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Exports player data to a tab-separated CSV string.
|
||||
* Excludes personal contact details and images.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function syncExportSpielerCSV(): string
|
||||
{
|
||||
$db = getDatabase();
|
||||
$jahr = date("Y");
|
||||
$query = "SELECT nachname, vorname, spielernr, lizenznr, lizenz, geschlecht";
|
||||
$query .= ",\n IF(ISNULL(geburtsjahr), IF(geschlecht = 'M', 'H', 'D'), IF(" . ($jahr - 18) . " <= geburtsjahr, 'J', IF(" . ($jahr - 50) . " > geburtsjahr, 'S', IF(geschlecht = 'M', 'H', 'D')))) AS kategorie";
|
||||
$query .= ",\n vereinsname as verein, vereinssitz, veranstalterbezeichnung as organisation, IF(mitgliedsstatus = 1, 'Aktiv', IF(mitgliedsstatus = 0, 'Ausgetreten', IF(mitgliedsstatus = 2, 'Eingeschränkt', 'Passiv'))) AS mitgliedsstatus";
|
||||
$query .= ",\n geburtsjahr";
|
||||
$query .= "\n FROM #__sportsmanager_spieler";
|
||||
$query .= "\n LEFT JOIN #__sportsmanager_mitglied_von_verein ON #__sportsmanager_spieler.spieler_id = #__sportsmanager_mitglied_von_verein.spieler_id AND #__sportsmanager_mitglied_von_verein.verein_id = #__sportsmanager_spieler.aktueller_verein_id"
|
||||
. "\n LEFT JOIN #__sportsmanager_verein ON #__sportsmanager_verein.verein_id = #__sportsmanager_spieler.aktueller_verein_id"
|
||||
. "\n LEFT JOIN #__sportsmanager_veranstalter ON #__sportsmanager_veranstalter.veranstalter_id = #__sportsmanager_verein.veranstalter_id";
|
||||
$query .= "\n WHERE NOT ISNULL(aktueller_verein_id) AND NOT ISNULL(spielernr) AND spielernr != ''";
|
||||
$query .= "\n ORDER BY nachname, vorname";
|
||||
|
||||
$rows = loadObjectList($db, $query);
|
||||
if (count($rows) === 0) {
|
||||
return "";
|
||||
}
|
||||
|
||||
$trennzeichen = "\t";
|
||||
$header = "";
|
||||
foreach ($rows[0] as $field => $value) {
|
||||
$header .= $field . $trennzeichen;
|
||||
}
|
||||
$header = rtrim($header, $trennzeichen);
|
||||
|
||||
$data = "";
|
||||
foreach ($rows as $row) {
|
||||
$line = '';
|
||||
foreach ($row as $value) {
|
||||
if ((!isset($value)) or ($value === "")) {
|
||||
$value = $trennzeichen;
|
||||
} else {
|
||||
$value = str_replace('"', '""', $value);
|
||||
$value = str_replace("\t", ' ', $value);
|
||||
$value = str_replace("\r", '', $value);
|
||||
$value = str_replace("\n", ' ', $value);
|
||||
$value = '="' . $value . '"' . $trennzeichen;
|
||||
}
|
||||
$line .= $value;
|
||||
}
|
||||
$data .= rtrim($line, $trennzeichen) . "\n";
|
||||
}
|
||||
$data = str_replace("\r", "", $data);
|
||||
|
||||
return "sep=" . $trennzeichen . "\n" . $header . "\n" . $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pushes the exported CSV data to DTFB (dtfb_sync_url) via cURL.
|
||||
*
|
||||
* @param string $csvData
|
||||
* @return array
|
||||
*/
|
||||
function syncPushToDtfb(string $csvData): array
|
||||
{
|
||||
$push_key = einstellungswert("api_push_key");
|
||||
$sync_url = einstellungswert("dtfb_sync_url");
|
||||
|
||||
if (empty($sync_url)) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Sync-URL nicht konfiguriert.'
|
||||
];
|
||||
}
|
||||
if (empty($push_key)) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'API Push Key nicht konfiguriert.'
|
||||
];
|
||||
}
|
||||
|
||||
$ch = curl_init($sync_url);
|
||||
if (!$ch) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Initialisierung von cURL fehlgeschlagen.'
|
||||
];
|
||||
}
|
||||
|
||||
curl_setopt_array($ch, array(
|
||||
CURLOPT_POST => TRUE,
|
||||
CURLOPT_RETURNTRANSFER => TRUE,
|
||||
CURLOPT_HTTPHEADER => array(
|
||||
'Authorization: Bearer ' . $push_key,
|
||||
'Content-Type: text/csv; charset=utf-8',
|
||||
),
|
||||
CURLOPT_TIMEOUT => 60,
|
||||
CURLOPT_POSTFIELDS => $csvData,
|
||||
));
|
||||
|
||||
$resp = curl_exec($ch);
|
||||
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
|
||||
if (curl_errno($ch)) {
|
||||
$error_msg = curl_error($ch);
|
||||
curl_close($ch);
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'cURL-Fehler: ' . $error_msg
|
||||
];
|
||||
}
|
||||
curl_close($ch);
|
||||
|
||||
if ($http_code !== 200) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'HTTP-Status ' . $http_code . ': ' . $resp
|
||||
];
|
||||
}
|
||||
|
||||
$result = json_decode($resp, true);
|
||||
if (json_last_error() === JSON_ERROR_NONE) {
|
||||
if (isset($result['success']) && $result['success']) {
|
||||
return [
|
||||
'success' => true,
|
||||
'message' => $result['message'] ?? 'Erfolgreich synchronisiert.',
|
||||
'spieler_count' => $result['spieler_count'] ?? 0,
|
||||
'spieler_updated' => $result['spieler_updated'] ?? 0,
|
||||
'spieler_added' => $result['spieler_added'] ?? 0
|
||||
];
|
||||
} else {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => $result['error'] ?? $result['message'] ?? 'Import auf Empfängerseite fehlgeschlagen.'
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
if (str_contains(strtolower($resp), 'success')) {
|
||||
return [
|
||||
'success' => true,
|
||||
'message' => 'Erfolgreich synchronisiert (Klartext-Antwort).'
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Unerwartete Antwort vom Server: ' . substr($resp, 0, 200)
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes incoming CSV data and imports it into the local database.
|
||||
* Aborts and returns an error if any organization name in the CSV cannot
|
||||
* be matched with an existing local organization.
|
||||
*
|
||||
* @param string $csvData
|
||||
* @return array
|
||||
*/
|
||||
function syncReceiveSpielerImport(string $csvData): array
|
||||
{
|
||||
if (!ini_get('safe_mode'))
|
||||
set_time_limit(300);
|
||||
|
||||
$db = getDatabase();
|
||||
|
||||
// Normalise the payload to UTF-8. The automatic/semi-automatic sync path is
|
||||
// UTF-8 end to end, but a legacy/manual export (e.g. from TFVHH) can be
|
||||
// latin1/Windows-1252 encoded. Without this, non-ASCII bytes (e.g. "ß" in an
|
||||
// organisation name) get truncated when staged into the utf8mb4 import table,
|
||||
// causing the organisation match to fail and every row to be skipped silently.
|
||||
if (!mb_check_encoding($csvData, 'UTF-8')) {
|
||||
$csvData = mb_convert_encoding($csvData, 'UTF-8', 'Windows-1252');
|
||||
}
|
||||
|
||||
$lines = explode("\n", str_replace("\r", "", $csvData));
|
||||
if (count($lines) < 2) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Keine Daten in der CSV-Datei gefunden.'
|
||||
];
|
||||
}
|
||||
|
||||
$lineIdx = 0;
|
||||
$titelzeile = trim($lines[$lineIdx]);
|
||||
|
||||
if (str_starts_with($titelzeile, "sep=")) {
|
||||
$trennzeichen = substr($titelzeile, 4);
|
||||
if ($trennzeichen === "") {
|
||||
$trennzeichen = "\t";
|
||||
}
|
||||
$lineIdx++;
|
||||
if (isset($lines[$lineIdx])) {
|
||||
$titelzeile = trim($lines[$lineIdx]);
|
||||
} else {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'CSV-Datei enthält nach sep= keine Titelzeile.'
|
||||
];
|
||||
}
|
||||
} else {
|
||||
$trennzeichen = "\t";
|
||||
}
|
||||
|
||||
$titel = explode($trennzeichen, strtolower($titelzeile));
|
||||
$spalte = array();
|
||||
foreach ($titel as $index => $bezeichnung) {
|
||||
$bezeichnung = trim($bezeichnung);
|
||||
$len = strlen($bezeichnung);
|
||||
if ($len >= 2 && $bezeichnung[0] === '"' && $bezeichnung[$len - 1] === '"') {
|
||||
$bezeichnung = trim(str_replace('""', '"', substr($bezeichnung, 1, $len - 2)));
|
||||
}
|
||||
|
||||
if ($bezeichnung === "name" || $bezeichnung === "nachname") {
|
||||
$spalte["nachname"] = $index;
|
||||
} else if ($bezeichnung === "vorname") {
|
||||
$spalte["vorname"] = $index;
|
||||
} else if ($bezeichnung === "name, vorname" || $bezeichnung === "name,vorname") {
|
||||
$spalte["name,vorname"] = $index;
|
||||
} else if ($bezeichnung === "pseudonym") {
|
||||
$spalte["pseudonym"] = $index;
|
||||
} else if ($bezeichnung === "geschlecht" || $bezeichnung === "anrede") {
|
||||
$spalte["geschlecht"] = $index;
|
||||
} else if ($bezeichnung === "spielernr" || $bezeichnung === "spielernr." || $bezeichnung === "spielerpass") {
|
||||
$spalte["spielernr"] = $index;
|
||||
} else if ($bezeichnung === "spielernr alt" || $bezeichnung === "spielernr. alt" || $bezeichnung === "spielernr_alt") {
|
||||
$spalte["spielernr_alt"] = $index;
|
||||
} else if ($bezeichnung === "lizenznr" || $bezeichnung === "lizenznr.") {
|
||||
$spalte["lizenznr"] = $index;
|
||||
} else if ($bezeichnung === "organisation") {
|
||||
$spalte["organisation"] = $index;
|
||||
} else if ($bezeichnung === "vereinssitz") {
|
||||
$spalte["vereinssitz"] = $index;
|
||||
} else if ($bezeichnung === "vereinsname" || $bezeichnung === "verein") {
|
||||
$spalte["vereinsname"] = $index;
|
||||
} else if ($bezeichnung === "geburtsdatum") {
|
||||
$spalte["geburtsdatum"] = $index;
|
||||
} else if ($bezeichnung === "geburtsjahr") {
|
||||
$spalte["geburtsjahr"] = $index;
|
||||
} else if ($bezeichnung === "email" || $bezeichnung === "e-mail") {
|
||||
$spalte["email"] = $index;
|
||||
} else if (str_starts_with($bezeichnung, "stra")) {
|
||||
$spalte["strasse"] = $index;
|
||||
} else if ($bezeichnung === "plz/ort") {
|
||||
$spalte["plz/ort"] = $index;
|
||||
} else if ($bezeichnung === "plz") {
|
||||
$spalte["plz"] = $index;
|
||||
} else if ($bezeichnung === "ort") {
|
||||
$spalte["ort"] = $index;
|
||||
} else if ($bezeichnung === "landeskennung") {
|
||||
$spalte["landeskennung"] = $index;
|
||||
} else if ($bezeichnung === "telefon") {
|
||||
$spalte["telefon"] = $index;
|
||||
} else if ($bezeichnung === "mobil") {
|
||||
$spalte["mobil"] = $index;
|
||||
} else if ($bezeichnung === "austritt" || $bezeichnung === "ausgetreten") {
|
||||
$spalte["ausgetreten"] = $index;
|
||||
} else if ($bezeichnung === "mitgliedsstatus") {
|
||||
$spalte["mitgliedsstatus"] = $index;
|
||||
}
|
||||
}
|
||||
|
||||
if (((!isset($spalte["nachname"]) || !isset($spalte["vorname"])) && !isset($spalte["name,vorname"])) || !isset($spalte["spielernr"])) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Die übergebene Datei ist keine gültige Spielerdatei (erforderliche Spalten fehlen).'
|
||||
];
|
||||
}
|
||||
|
||||
$lineIdx++;
|
||||
// Source the staging session id from the database clock, not PHP's. The
|
||||
// stale-row cleanup below compares session_id against the database NOW(); if
|
||||
// PHP and the database run in different timezones, a PHP-generated timestamp
|
||||
// can fall outside the window and the just-inserted rows get deleted mid-import.
|
||||
$session_id = loadResult($db, "SELECT DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%s')");
|
||||
if (empty($session_id)) {
|
||||
$session_id = date('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
$organisations = [];
|
||||
$rows_to_insert = [];
|
||||
|
||||
for ($i = $lineIdx; $i < count($lines); $i++) {
|
||||
$buffer = trim($lines[$i]);
|
||||
if ($buffer === "") {
|
||||
continue;
|
||||
}
|
||||
|
||||
$daten = explode($trennzeichen, $buffer);
|
||||
foreach ($daten as $index => $wert) {
|
||||
$wert = trim($wert);
|
||||
$len = strlen($wert);
|
||||
if ($len < 2 || $wert[$len - 1] !== '"' || !($wert[0] === '"' || ($wert[0] === '=' && $wert[1] === '"'))) {
|
||||
$daten[$index] = $wert;
|
||||
} else if ($wert[0] === '"') {
|
||||
$daten[$index] = trim(str_replace('""', '"', substr($wert, 1, $len - 2)));
|
||||
} else {
|
||||
$daten[$index] = trim(str_replace('""', '"', substr($wert, 2, $len - 3)));
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($spalte["vorname"]) && isset($spalte["nachname"]) && isset($daten[$spalte["vorname"]]) && isset($daten[$spalte["nachname"]])) {
|
||||
$nachname = $daten[$spalte["nachname"]];
|
||||
$vorname = $daten[$spalte["vorname"]];
|
||||
} else if (isset($spalte["name,vorname"]) && isset($daten[$spalte["name,vorname"]])) {
|
||||
$pos = strpos($daten[$spalte["name,vorname"]], ",");
|
||||
if ($pos === false) {
|
||||
continue;
|
||||
}
|
||||
$nachname = trim(substr($daten[$spalte["name,vorname"]], 0, $pos));
|
||||
$vorname = trim(substr($daten[$spalte["name,vorname"]], $pos + 1));
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($vorname === "" || $nachname === "") {
|
||||
continue;
|
||||
}
|
||||
|
||||
$mitgliedsstatus = 1;
|
||||
if (isset($spalte["mitgliedsstatus"]) && !empty($daten[$spalte["mitgliedsstatus"]])) {
|
||||
$s = strtolower($daten[$spalte["mitgliedsstatus"]]);
|
||||
if ($s === "ausgetreten") {
|
||||
$mitgliedsstatus = 0;
|
||||
} else if ($s === "passiv") {
|
||||
$mitgliedsstatus = 3;
|
||||
} else if (str_starts_with($s, "eingeschr")) {
|
||||
$mitgliedsstatus = 2;
|
||||
}
|
||||
} else if (isset($spalte["ausgetreten"]) && !empty($daten[$spalte["ausgetreten"]])) {
|
||||
if (strtolower($daten[$spalte["ausgetreten"]]) === "ja") {
|
||||
$mitgliedsstatus = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if ($mitgliedsstatus == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$geschlecht = isset($spalte["geschlecht"]) && !empty($daten[$spalte["geschlecht"]]) ? (($daten[$spalte["geschlecht"]][0] === "M" || $daten[$spalte["geschlecht"]][0] === "m" || $daten[$spalte["geschlecht"]][0] === "H" || $daten[$spalte["geschlecht"]][0] === "h") ? "M" : "W") : "M";
|
||||
$spielernr = isset($daten[$spalte["spielernr"]]) ? trim($daten[$spalte["spielernr"]]) : "";
|
||||
// Validate the Passnummer with the same format the manual import enforces
|
||||
// (NN-NNNN[NN]). Invalid values are dropped rather than aborting the whole
|
||||
// automated feed, keeping the player but treating them as having no pass.
|
||||
if (!empty($spielernr) && !preg_match('/^[0-9]{2}-[0-9]{4,6}$/', $spielernr)) {
|
||||
$spielernr = "";
|
||||
}
|
||||
|
||||
$spielernr_alt = isset($spalte["spielernr_alt"]) && isset($daten[$spalte["spielernr_alt"]]) ? trim($daten[$spalte["spielernr_alt"]]) : "";
|
||||
if (!empty($spielernr_alt) && !preg_match('/^[0-9]{2}-[0-9]{4,6}$/', $spielernr_alt)) {
|
||||
$spielernr_alt = "";
|
||||
}
|
||||
$lizenznr = isset($spalte["lizenznr"]) && isset($daten[$spalte["lizenznr"]]) ? $daten[$spalte["lizenznr"]] : "";
|
||||
if (!empty($lizenznr) && !ctype_digit(substr($lizenznr, strlen($lizenznr) - 1, 1))) {
|
||||
$lizenznr = "";
|
||||
}
|
||||
|
||||
$pseudonym = isset($spalte["pseudonym"]) && isset($daten[$spalte["pseudonym"]]) ? $daten[$spalte["pseudonym"]] : "";
|
||||
$organisation = isset($spalte["organisation"]) && isset($daten[$spalte["organisation"]]) ? $daten[$spalte["organisation"]] : "";
|
||||
$vereinssitz = isset($spalte["vereinssitz"]) && isset($daten[$spalte["vereinssitz"]]) ? $daten[$spalte["vereinssitz"]] : "";
|
||||
$vereinsname = isset($spalte["vereinsname"]) && isset($daten[$spalte["vereinsname"]]) ? $daten[$spalte["vereinsname"]] : "";
|
||||
|
||||
$geburtsjahr = isset($spalte["geburtsjahr"]) && isset($daten[$spalte["geburtsjahr"]]) ? $daten[$spalte["geburtsjahr"]] : null;
|
||||
if (empty($geburtsjahr) || !ctype_digit($geburtsjahr) || $geburtsjahr < 1800) {
|
||||
$geburtsjahr = null;
|
||||
}
|
||||
|
||||
if (!empty($organisation)) {
|
||||
$organisations[trim($organisation)] = true;
|
||||
}
|
||||
|
||||
$rows_to_insert[] = [
|
||||
'vorname' => $vorname,
|
||||
'nachname' => $nachname,
|
||||
'spielernr' => $spielernr,
|
||||
'spielernr_alt' => $spielernr_alt,
|
||||
'lizenznr' => $lizenznr,
|
||||
'pseudonym' => $pseudonym,
|
||||
'organisation' => $organisation,
|
||||
'vereinssitz' => $vereinssitz,
|
||||
'vereinsname' => $vereinsname,
|
||||
'geburtsjahr' => $geburtsjahr,
|
||||
'mitgliedsstatus' => $mitgliedsstatus,
|
||||
'geschlecht' => $geschlecht
|
||||
];
|
||||
}
|
||||
|
||||
if (empty($rows_to_insert)) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Keine gültigen Spielerzeilen zum Importieren gefunden.'
|
||||
];
|
||||
}
|
||||
|
||||
// Auto-match Veranstalter by name. If it does not match, abort.
|
||||
$org_map = [];
|
||||
foreach (array_keys($organisations) as $orgName) {
|
||||
$query = "SELECT veranstalter_id FROM #__sportsmanager_veranstalter WHERE veranstalterbezeichnung = '" . $db->escape($orgName) . "'";
|
||||
$res = loadObjectList($db, $query);
|
||||
if (count($res) === 0) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Veranstalter "' . $orgName . '" existiert nicht auf diesem Empfänger-System. Import abgebrochen.'
|
||||
];
|
||||
}
|
||||
$org_map[$orgName] = intval($res[0]->veranstalter_id);
|
||||
}
|
||||
|
||||
// Insert into staging table
|
||||
foreach ($rows_to_insert as $row) {
|
||||
$query = "INSERT INTO #__sportsmanager_spieler_import"
|
||||
. "\n SET session_id = '" . $db->escape($session_id) . "',"
|
||||
. "\n vorname = '" . $db->escape($row['vorname']) . "',"
|
||||
. "\n nachname = '" . $db->escape($row['nachname']) . "',"
|
||||
. "\n spielernr = '" . $db->escape($row['spielernr']) . "',"
|
||||
. "\n spielernr_alt = '" . $db->escape($row['spielernr_alt']) . "',"
|
||||
. "\n lizenznr = '" . $db->escape($row['lizenznr']) . "',"
|
||||
. "\n pseudonym = '" . $db->escape($row['pseudonym']) . "',"
|
||||
. "\n geschlecht = '" . $db->escape($row['geschlecht']) . "',"
|
||||
. "\n geburtsjahr = " . ($row['geburtsjahr'] === null ? "NULL" : "'" . $db->escape($row['geburtsjahr']) . "'") . ","
|
||||
. "\n vereinsname = '" . $db->escape($row['vereinsname']) . "',"
|
||||
. "\n vereinssitz = '" . $db->escape($row['vereinssitz']) . "',"
|
||||
. "\n veranstalterbezeichnung = '" . $db->escape($row['organisation']) . "',"
|
||||
. "\n mitgliedsstatus = '" . $row['mitgliedsstatus'] . "'";
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Fehler beim Schreiben in die Staging-Tabelle: ' . $db->stderr()
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
// Clean up older staging data (older than 5 minutes)
|
||||
$query = "SELECT DISTINCT session_id"
|
||||
. "\n FROM #__sportsmanager_spieler_import"
|
||||
. "\n WHERE session_id < SUBTIME(NOW(), '00:05:00')";
|
||||
$old_sessions = loadObjectList($db, $query);
|
||||
foreach ($old_sessions as $old_session) {
|
||||
$query = "DELETE FROM #__sportsmanager_spieler_import WHERE session_id = '" . $db->escape($old_session->session_id) . "'";
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
}
|
||||
|
||||
// Fetch staging players with matching ID
|
||||
$query = "SELECT #__sportsmanager_spieler_import.*, #__sportsmanager_spieler.spieler_id"
|
||||
. "\n FROM #__sportsmanager_spieler_import"
|
||||
. "\n LEFT JOIN #__sportsmanager_spieler ON #__sportsmanager_spieler_import.spielernr != '' AND #__sportsmanager_spieler_import.spielernr = #__sportsmanager_spieler.spielernr"
|
||||
. "\n WHERE session_id = '" . $db->escape($session_id) . "'";
|
||||
$spieler_import = loadObjectList($db, $query);
|
||||
|
||||
// Count how many active players the incoming payload provides per organisation.
|
||||
// The mass-deactivation below is only safe when the payload is a *full* roster;
|
||||
// a partial CSV would otherwise silently deactivate every member not listed.
|
||||
$incoming_per_org = [];
|
||||
foreach ($rows_to_insert as $row) {
|
||||
$o = trim($row['organisation']);
|
||||
if ($o !== "") {
|
||||
$incoming_per_org[$o] = ($incoming_per_org[$o] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
// Minimum fraction of the currently-active roster the payload must contain
|
||||
// before the sweep is allowed to run. Configurable; defaults to 0.5.
|
||||
$deactivation_min_ratio = (float) (einstellungswert("sync_deactivation_min_ratio") ?? 0.5);
|
||||
if ($deactivation_min_ratio <= 0 || $deactivation_min_ratio > 1) {
|
||||
$deactivation_min_ratio = 0.5;
|
||||
}
|
||||
|
||||
$warnings = [];
|
||||
$deactivated_total = 0;
|
||||
|
||||
// Deactivate all memberships for involved organisations temporarily. The
|
||||
// players present in the payload are reactivated further below; anyone not
|
||||
// listed stays deactivated (i.e. is treated as having left the organisation).
|
||||
foreach ($org_map as $orgName => $veranstalterId) {
|
||||
$aktiv_vorher = (int) loadResult(
|
||||
$db,
|
||||
"SELECT COUNT(*) FROM #__sportsmanager_mitglied_von_verein"
|
||||
. " INNER JOIN #__sportsmanager_verein USING (verein_id)"
|
||||
. " WHERE veranstalter_id = " . $veranstalterId
|
||||
. " AND NOT #__sportsmanager_mitglied_von_verein.ausgetreten"
|
||||
);
|
||||
$eingehend = $incoming_per_org[$orgName] ?? 0;
|
||||
|
||||
// Guard: skip the sweep when the payload looks like a partial roster
|
||||
// (far fewer players than are currently active). This prevents a partial
|
||||
// export from wiping an entire organisation's memberships.
|
||||
if ($aktiv_vorher > 0 && $eingehend < $aktiv_vorher * $deactivation_min_ratio) {
|
||||
$warnings[] = sprintf(
|
||||
'Massen-Deaktivierung für "%s" übersprungen: nur %d von %d aktiven Mitgliedern in den Daten (mögliche Teil-Liste).',
|
||||
$orgName,
|
||||
$eingehend,
|
||||
$aktiv_vorher
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
$query = "UPDATE #__sportsmanager_mitglied_von_verein INNER JOIN #__sportsmanager_verein USING (verein_id)"
|
||||
. "\n SET mitgliedsstatus = 0,"
|
||||
. "\n #__sportsmanager_mitglied_von_verein.ausgetreten = TRUE"
|
||||
. "\n WHERE veranstalter_id = " . $veranstalterId;
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Fehler beim Deaktivieren der alten Vereinsmitgliedschaften.'
|
||||
];
|
||||
}
|
||||
$deactivated_total += $aktiv_vorher;
|
||||
}
|
||||
|
||||
$spieler_updated = 0;
|
||||
$spieler_added = 0;
|
||||
$spielerIdsHinzugefuegt = array();
|
||||
|
||||
foreach ($spieler_import as $t) {
|
||||
$orgName = $t->veranstalterbezeichnung;
|
||||
$veranstalterId = $org_map[$orgName] ?? -1;
|
||||
|
||||
if ($veranstalterId === -1 && !empty($orgName)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$spieler_id = $t->spieler_id;
|
||||
$nachname = $t->nachname;
|
||||
$vorname = $t->vorname;
|
||||
$geschlecht = $t->geschlecht;
|
||||
$lizenznr = $t->lizenznr;
|
||||
$pseudonym = $t->pseudonym;
|
||||
$vereinsname = $t->vereinsname;
|
||||
$vereinssitz = $t->vereinssitz;
|
||||
$geburtsjahr = $t->geburtsjahr;
|
||||
$spielernr = $t->spielernr;
|
||||
$mitgliedsstatus = $t->mitgliedsstatus;
|
||||
|
||||
if ($spieler_id === null && !empty($spielernr) && isset($spielerIdsHinzugefuegt[$spielernr])) {
|
||||
$spieler_id = $spielerIdsHinzugefuegt[$spielernr];
|
||||
}
|
||||
|
||||
if ($spieler_id === null && empty($spielernr)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($spieler_id === null && empty($vereinsname)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($spieler_id !== null) {
|
||||
$query = "UPDATE #__sportsmanager_spieler"
|
||||
. "\n SET vorname = '" . $db->escape($vorname) . "',"
|
||||
. "\n nachname = '" . $db->escape($nachname) . "',"
|
||||
. "\n geschlecht = '" . $db->escape($geschlecht) . "'"
|
||||
. "\n WHERE spieler_id = " . intval($spieler_id);
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Fehler beim Aktualisieren des Spielers ID ' . $spieler_id
|
||||
];
|
||||
}
|
||||
$spieler_updated++;
|
||||
} else {
|
||||
$query = "INSERT INTO #__sportsmanager_spieler"
|
||||
. "\n SET vorname = '" . $db->escape($vorname) . "',"
|
||||
. "\n nachname = '" . $db->escape($nachname) . "',"
|
||||
. "\n spielernr = '" . $db->escape($spielernr) . "',"
|
||||
. "\n lizenznr = '" . $db->escape($lizenznr) . "',"
|
||||
. "\n geschlecht = '" . $db->escape($geschlecht) . "',"
|
||||
. "\n geburtsjahr = " . ($geburtsjahr === null ? "NULL" : "'" . $db->escape($geburtsjahr) . "'");
|
||||
if (!empty($pseudonym)) {
|
||||
$query .= ",\n pseudonym = '" . $db->escape($pseudonym) . "'";
|
||||
}
|
||||
$db->setQuery($query);
|
||||
if (!$db->execute()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Fehler beim Anlegen des neuen Spielers ' . $vorname . ' ' . $nachname
|
||||
];
|
||||
}
|
||||
$spieler_id = $db->insertid();
|
||||
$spielerIdsHinzugefuegt[$spielernr] = $spieler_id;
|
||||
|
||||
$spieler_added++;
|
||||
}
|
||||
|
||||
if (!empty($vereinsname) && $veranstalterId !== -1) {
|
||||
$query = "SELECT spieler_id FROM #__sportsmanager_mitglied_von_verein"
|
||||
. "\n WHERE spieler_id = $spieler_id AND verein_id = "
|
||||
. " (SELECT verein_id FROM #__sportsmanager_verein WHERE vereinsname = '" . $db->escape($vereinsname) . "' AND veranstalter_id = $veranstalterId LIMIT 1)";
|
||||
$memb_check = loadObjectList($db, $query);
|
||||
|
||||
if (count($memb_check) > 0) {
|
||||
$query = "UPDATE #__sportsmanager_mitglied_von_verein, #__sportsmanager_verein"
|
||||
. "\n SET mitgliedsstatus = '$mitgliedsstatus', #__sportsmanager_mitglied_von_verein.ausgetreten = FALSE"
|
||||
. "\n WHERE spieler_id = $spieler_id AND vereinsname = '" . $db->escape($vereinsname) . "' AND #__sportsmanager_verein.verein_id = #__sportsmanager_mitglied_von_verein.verein_id"
|
||||
. " AND veranstalter_id = $veranstalterId";
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
} else {
|
||||
$query = "SELECT verein_id FROM #__sportsmanager_verein"
|
||||
. "\n WHERE vereinsname = '" . $db->escape($vereinsname) . "' AND veranstalter_id = $veranstalterId";
|
||||
$club_rows = loadObjectList($db, $query);
|
||||
|
||||
if (count($club_rows) > 0) {
|
||||
$verein_id = intval($club_rows[0]->verein_id);
|
||||
} else {
|
||||
$query = "INSERT INTO #__sportsmanager_verein"
|
||||
. "\n SET vereinsname = '" . $db->escape($vereinsname) . "',"
|
||||
. "\n veranstalter_id = $veranstalterId";
|
||||
if (!empty($vereinssitz)) {
|
||||
$query .= ",\n vereinssitz = '" . $db->escape($vereinssitz) . "'";
|
||||
}
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
$verein_id = $db->insertid();
|
||||
}
|
||||
|
||||
$query = "INSERT INTO #__sportsmanager_mitglied_von_verein"
|
||||
. "\n SET spieler_id = $spieler_id, verein_id = $verein_id, mitgliedsstatus = '$mitgliedsstatus', ausgetreten = FALSE";
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($org_map as $orgName => $veranstalterId) {
|
||||
$query = "UPDATE #__sportsmanager_verein"
|
||||
. "\n SET ausgetreten = TRUE"
|
||||
. "\n WHERE NOT EXISTS(SELECT * FROM #__sportsmanager_mitglied_von_verein WHERE #__sportsmanager_verein.verein_id = #__sportsmanager_mitglied_von_verein.verein_id AND NOT #__sportsmanager_mitglied_von_verein.ausgetreten) AND NOT ausgetreten AND veranstalter_id = " . $veranstalterId;
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
|
||||
$query = "UPDATE #__sportsmanager_verein"
|
||||
. "\n SET ausgetreten = FALSE"
|
||||
. "\n WHERE EXISTS(SELECT * FROM #__sportsmanager_mitglied_von_verein WHERE #__sportsmanager_verein.verein_id = #__sportsmanager_mitglied_von_verein.verein_id AND NOT #__sportsmanager_mitglied_von_verein.ausgetreten) AND ausgetreten AND veranstalter_id = " . $veranstalterId;
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
|
||||
$query = "SELECT DISTINCT verein_id, #__sportsmanager_spieler_import.vereinsname, #__sportsmanager_spieler_import.vereinssitz"
|
||||
. "\n FROM #__sportsmanager_spieler_import"
|
||||
. "\n INNER JOIN #__sportsmanager_verein ON #__sportsmanager_verein.vereinsname = #__sportsmanager_spieler_import.vereinsname"
|
||||
. "\n WHERE session_id = '" . $db->escape($session_id) . "' AND #__sportsmanager_spieler_import.veranstalterbezeichnung = '" . $db->escape($orgName) . "' AND #__sportsmanager_spieler_import.vereinsname != '' AND #__sportsmanager_spieler_import.vereinssitz != '' AND (ISNULL(#__sportsmanager_verein.vereinssitz) OR #__sportsmanager_verein.vereinssitz != #__sportsmanager_spieler_import.vereinssitz) AND NOT #__sportsmanager_verein.ausgetreten AND veranstalter_id = " . $veranstalterId;
|
||||
$rows_headquarters = loadObjectList($db, $query);
|
||||
foreach ($rows_headquarters as $row) {
|
||||
$query = "UPDATE #__sportsmanager_verein"
|
||||
. "\n SET vereinssitz = '" . $db->escape($row->vereinssitz) . "'"
|
||||
. "\n WHERE verein_id = $row->verein_id";
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
}
|
||||
}
|
||||
|
||||
$query = "DELETE FROM #__sportsmanager_spieler_import WHERE session_id = '" . $db->escape($session_id) . "'";
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
|
||||
// Fail loudly on a zero-effect import: if valid rows were parsed but nothing
|
||||
// was added or updated, the data almost certainly failed to map (e.g. an
|
||||
// encoding mismatch corrupting organisation names). Reporting success here
|
||||
// would silently hide data loss.
|
||||
if (count($rows_to_insert) > 0 && $spieler_added === 0 && $spieler_updated === 0) {
|
||||
return [
|
||||
'success' => false,
|
||||
'message' => 'Import ergab keine Änderungen trotz ' . count($rows_to_insert)
|
||||
. ' gültiger Zeilen – mögliche Encoding- oder Zuordnungsfehler.',
|
||||
'spieler_count' => count($rows_to_insert),
|
||||
'spieler_updated' => 0,
|
||||
'spieler_added' => 0,
|
||||
'warnings' => $warnings
|
||||
];
|
||||
}
|
||||
|
||||
aktuellerVereinAktualisieren();
|
||||
ranglisteAktualisieren();
|
||||
einstufungAktualisieren();
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'spieler_count' => count($rows_to_insert),
|
||||
'spieler_updated' => $spieler_updated,
|
||||
'spieler_added' => $spieler_added,
|
||||
'deactivated' => $deactivated_total,
|
||||
'warnings' => $warnings
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Endpoint task: triggered by GitHub Actions or other schedule.
|
||||
* Authenticates with local api_push_key, exports player data, pushes to DTFB, and returns JSON.
|
||||
*/
|
||||
function apiSyncSpielerTrigger(): void
|
||||
{
|
||||
$token = syncGetBearerToken();
|
||||
$expected_key = einstellungswert("api_push_key");
|
||||
|
||||
if (empty($expected_key) || $token !== $expected_key) {
|
||||
header('HTTP/1.1 401 Unauthorized');
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
echo json_encode(['success' => false, 'error' => 'Ungültiges Authentifizierungs-Token.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$csvData = syncExportSpielerCSV();
|
||||
if (empty($csvData)) {
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
echo json_encode(['success' => false, 'error' => 'Keine Spieler zum Synchronisieren gefunden.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$res = syncPushToDtfb($csvData);
|
||||
|
||||
// Log sync status
|
||||
syncLogEntry(
|
||||
'push',
|
||||
'api',
|
||||
$res['success'] ? 'success' : 'error',
|
||||
$res['spieler_count'] ?? 0,
|
||||
$res['spieler_updated'] ?? 0,
|
||||
$res['spieler_added'] ?? 0,
|
||||
$res['message'] ?? '',
|
||||
''
|
||||
);
|
||||
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
if ($res['success']) {
|
||||
echo json_encode($res);
|
||||
} else {
|
||||
header('HTTP/1.1 500 Internal Server Error');
|
||||
echo json_encode($res);
|
||||
}
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Endpoint task: receives CSV data from another Sportsmanager instance, imports it.
|
||||
* Authenticates with local api_push_key.
|
||||
*/
|
||||
function apiSyncSpielerReceive(): void
|
||||
{
|
||||
$token = syncGetBearerToken();
|
||||
$expected_key = einstellungswert("api_push_key");
|
||||
|
||||
if (empty($expected_key) || $token !== $expected_key) {
|
||||
header('HTTP/1.1 401 Unauthorized');
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
echo json_encode(['success' => false, 'error' => 'Ungültiges Authentifizierungs-Token.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$csvData = file_get_contents('php://input');
|
||||
if (empty($csvData)) {
|
||||
header('HTTP/1.1 400 Bad Request');
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
echo json_encode(['success' => false, 'error' => 'Keine Formulardaten empfangen.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$res = syncReceiveSpielerImport($csvData);
|
||||
|
||||
// Log sync status
|
||||
syncLogEntry(
|
||||
'receive',
|
||||
'api',
|
||||
$res['success'] ? 'success' : 'error',
|
||||
$res['spieler_count'] ?? 0,
|
||||
$res['spieler_updated'] ?? 0,
|
||||
$res['spieler_added'] ?? 0,
|
||||
$res['message'] ?? '',
|
||||
''
|
||||
);
|
||||
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
if ($res['success']) {
|
||||
echo json_encode($res);
|
||||
} else {
|
||||
header('HTTP/1.1 500 Internal Server Error');
|
||||
echo json_encode($res);
|
||||
}
|
||||
exit;
|
||||
}
|
||||
@@ -1,804 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Joomla/PHP export to importFormat.json structure.
|
||||
*
|
||||
* Assumptions:
|
||||
* - Joomla table prefix is used via #__.
|
||||
* - Source timezone is Europe/Berlin; output is UTC ISO-8601 "Z".
|
||||
* - For turnier:
|
||||
* - rundenstufe = 10 => Vorrunde
|
||||
* - rundenstufe = 1,2,3 => Hauptrunde with groups:
|
||||
* 1 => Profifeld, 2 => Amateurfeld, 3 => Hobbyfeld
|
||||
* - For team-based exports:
|
||||
* - stage/group are synthesized as defaults.
|
||||
*
|
||||
* Place this in a Joomla context (CLI script, controller, or a small admin entry point).
|
||||
*/
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\Database\DatabaseDriver;
|
||||
|
||||
final class SMExporter
|
||||
{
|
||||
|
||||
private DatabaseDriver $db;
|
||||
|
||||
private DateTimeZone $sourceTz;
|
||||
private DateTimeZone $outputTz;
|
||||
|
||||
// Optional filter; set to null for all seasons
|
||||
private $exportSeasonId = null;
|
||||
|
||||
// Optional file output; set to null to echo JSON only
|
||||
private string $outputFile = JPATH_ROOT . '/tsm.json';
|
||||
|
||||
private array $playerCache = [];
|
||||
private array $meldungsPlayersCache = [];
|
||||
private array $teamCache = [];
|
||||
|
||||
private array $disciplineShortNames = ['Offenes Doppel' => 'OD',
|
||||
'Offenes Einzel' => 'OE',
|
||||
'Damen Doppel' => 'DD',
|
||||
'Damen Einzel' => 'DE',
|
||||
'Herren Doppel' => 'HD',
|
||||
'Herren Einzel' => 'HE',
|
||||
'Junioren Doppel' => 'JD',
|
||||
'Junioren Einzel' => 'JE',
|
||||
'Senioren Doppel' => 'SD',
|
||||
'Senioren Einzel' => 'SE',];
|
||||
|
||||
public function __construct(DatabaseDriver $db)
|
||||
{
|
||||
$this->db = $db;
|
||||
$this->sourceTz = new DateTimeZone('Europe/Berlin');
|
||||
$this->outputTz = new DateTimeZone('UTC');
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a DB date/datetime into UTC ISO-8601.
|
||||
*/
|
||||
function isoUtc(?string $value, DateTimeZone $sourceTz, DateTimeZone $outputTz): ?string
|
||||
{
|
||||
if (!$value || $value === '0000-00-00' || $value === '0000-00-00 00:00:00') {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
$dt = new DateTimeImmutable($value, $sourceTz);
|
||||
return $dt->setTimezone($outputTz)->format('Y-m-d\TH:i:s\Z');
|
||||
} catch (Throwable $e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Build shortName from kuerzel or disziplin text.
|
||||
*/
|
||||
function disciplineShortName(?string $kuerzel, ?string $disziplin): string
|
||||
{
|
||||
$kuerzel = trim((string)$kuerzel);
|
||||
if ($kuerzel !== '') {
|
||||
return $kuerzel;
|
||||
}
|
||||
|
||||
$disziplin = (string)$disziplin;
|
||||
foreach ($this->disciplineShortNames as $needle => $short) {
|
||||
if (mb_stripos($disziplin, $needle) !== false) {
|
||||
return $short;
|
||||
}
|
||||
}
|
||||
|
||||
// Last-resort fallback: initials of the words
|
||||
$words = preg_split('/\s+/', trim($disziplin));
|
||||
$initials = '';
|
||||
foreach ($words as $w) {
|
||||
if ($w !== '') {
|
||||
$initials .= mb_substr($w, 0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
return $initials !== '' ? mb_strtoupper($initials) : 'X';
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a person object from spieler_id or from turniermeldung_spieler_name.
|
||||
*/
|
||||
function getPersonForSpieler(
|
||||
Joomla\Database\DatabaseInterface $db,
|
||||
?int $spielerId,
|
||||
?int $turniermeldungSpielerId,
|
||||
array &$playerCache
|
||||
): array
|
||||
{
|
||||
if ($spielerId && isset($playerCache[$spielerId])) {
|
||||
return $playerCache[$spielerId];
|
||||
}
|
||||
|
||||
if ($spielerId) {
|
||||
$query = $db->getQuery(true)
|
||||
->select(['spieler_id', 'vorname', 'nachname', 'spielernr'])
|
||||
->from($db->quoteName('#__sportsmanager_spieler'))
|
||||
->where($db->quoteName('spieler_id') . ' = ' . (int)$spielerId);
|
||||
|
||||
$db->setQuery($query);
|
||||
$row = $db->loadObject();
|
||||
|
||||
$person = [
|
||||
'name' => $row ? trim(($row->vorname ?? '') . ' ' . ($row->nachname ?? '')) : ('Spieler ' . $spielerId),
|
||||
'playerNr' => $row && !empty($row->spielernr) ? (string)$row->spielernr : null,
|
||||
];
|
||||
|
||||
$playerCache[$spielerId] = $person;
|
||||
return $person;
|
||||
}
|
||||
|
||||
if ($turniermeldungSpielerId) {
|
||||
$query = $db->getQuery(true)
|
||||
->select(['vorname', 'nachname', 'vereinsname'])
|
||||
->from($db->quoteName('#__sportsmanager_turniermeldung_spieler_name'))
|
||||
->where($db->quoteName('turniermeldung_spieler_id') . ' = ' . (int)$turniermeldungSpielerId)
|
||||
->order('turniermeldung_spieler_name_id ASC');
|
||||
|
||||
$db->setQuery($query);
|
||||
$row = $db->loadObject();
|
||||
|
||||
if ($row) {
|
||||
return [
|
||||
'name' => trim(($row->vorname ?? '') . ' ' . ($row->nachname ?? '')),
|
||||
'playerNr' => null,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'name' => 'Unknown',
|
||||
'playerNr' => null,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all players assigned to a turniermeldung.
|
||||
*/
|
||||
function getMeldungPlayers(
|
||||
Joomla\Database\DatabaseInterface $db,
|
||||
int $turniermeldungId,
|
||||
array &$meldungsPlayersCache,
|
||||
array &$playerCache
|
||||
): array
|
||||
{
|
||||
if (isset($meldungsPlayersCache[$turniermeldungId])) {
|
||||
return $meldungsPlayersCache[$turniermeldungId];
|
||||
}
|
||||
|
||||
$query = $db->getQuery(true)
|
||||
->select(['tms.turniermeldung_spieler_id', 'tms.spieler_id'])
|
||||
->from($db->quoteName('#__sportsmanager_turniermeldung_spieler', 'tms'))
|
||||
->where('tms.turniermeldung_id = ' . $turniermeldungId)
|
||||
->order('tms.turniermeldung_spieler_id ASC');
|
||||
|
||||
$db->setQuery($query);
|
||||
$rows = $db->loadObjectList();
|
||||
|
||||
$players = [];
|
||||
foreach ($rows as $row) {
|
||||
$players[] = $this->getPersonForSpieler($db, $row->spieler_id ? (int)$row->spieler_id : null, (int)$row->turniermeldung_spieler_id, $playerCache);
|
||||
}
|
||||
|
||||
$meldungsPlayersCache[$turniermeldungId] = $players;
|
||||
return $players;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build display name for a side.
|
||||
*/
|
||||
function buildSideName(array $players): string
|
||||
{
|
||||
if (count($players) === 0) {
|
||||
return 'Unknown';
|
||||
}
|
||||
|
||||
if (count($players) === 1) {
|
||||
return $players[0]['name'];
|
||||
}
|
||||
|
||||
$names = [];
|
||||
foreach ($players as $p) {
|
||||
$names[] = $p['name'];
|
||||
}
|
||||
|
||||
return implode(' / ', $names);
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse set scores from a result string.
|
||||
* Supports patterns like "11:7;11:9", "11-7 11-9", etc.
|
||||
*/
|
||||
function parseSets(array $detail): array
|
||||
{
|
||||
$sets = [];
|
||||
$n = 1;
|
||||
foreach ($detail as $set) {
|
||||
$set = trim((string)$set);
|
||||
if ($set === '') {
|
||||
continue;
|
||||
}
|
||||
|
||||
preg_match_all('/(\d{1,2})\s*[:\-]\s*(\d{1,2})/', $set, $m, PREG_SET_ORDER);
|
||||
foreach ($m as $match) {
|
||||
$sets[] = [
|
||||
'number' => $n++,
|
||||
'scoreHome' => (int)$match[1],
|
||||
'scoreAway' => (int)$match[2],
|
||||
];
|
||||
}
|
||||
}
|
||||
return $sets;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine match state.
|
||||
*/
|
||||
function determineMatchState($result, array $detail): string
|
||||
{
|
||||
if ($result !== null || ( !empty($detail) && !array_filter($detail, fn($v) => $v === null || trim((string)$v) === ''))) {
|
||||
return 'PLAYED';
|
||||
}
|
||||
return 'SCHEDULED';
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine match state.
|
||||
*/
|
||||
function determineWinner(array $detail, string $sourceType): string
|
||||
{
|
||||
if ($sourceType === 'TEAM') {
|
||||
$sets = $this->parseSets($detail);
|
||||
$homeSetsWon = 0;
|
||||
$awaySetsWon = 0;
|
||||
foreach ($sets as $set) {
|
||||
if ($set['scoreHome'] > $set['scoreAway']) {
|
||||
$homeSetsWon++;
|
||||
} elseif ($set['scoreHome'] < $set['scoreAway']) {
|
||||
$awaySetsWon++;
|
||||
}
|
||||
}
|
||||
if ($homeSetsWon > $awaySetsWon) {
|
||||
return 'HOME';
|
||||
} elseif ($homeSetsWon < $awaySetsWon) {
|
||||
return 'AWAY';
|
||||
}
|
||||
return 'DRAW';
|
||||
} else {
|
||||
if (count($detail) >0) {
|
||||
if ($detail[0] == 1) {
|
||||
return 'HOME';
|
||||
} elseif ($detail[0] == 2) {
|
||||
return 'AWAY';
|
||||
} else {
|
||||
return 'DRAW';
|
||||
}
|
||||
}
|
||||
return 'UNKNOWN';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine group state based on a cutoff date.
|
||||
*/
|
||||
function determineFinishedState(?string $cutoffDate): string
|
||||
{
|
||||
if (!$cutoffDate || $cutoffDate === '0000-00-00') {
|
||||
return 'PLANNED';
|
||||
}
|
||||
|
||||
$today = new DateTimeImmutable('today');
|
||||
$cutoff = new DateTimeImmutable($cutoffDate);
|
||||
|
||||
return ($cutoff < $today) ? 'FINISHED' : 'RUNNING';
|
||||
}
|
||||
|
||||
/**
|
||||
* Build one match object.
|
||||
*/
|
||||
function buildMatch(
|
||||
array $homePlayers,
|
||||
array $awayPlayers,
|
||||
?string $startDate,
|
||||
?string $endDate,
|
||||
?int $result,
|
||||
array $detail,
|
||||
string $sourceType
|
||||
): array
|
||||
{
|
||||
$type = (count($homePlayers) > 1 || count($awayPlayers) > 1) ? 'DOUBLE' : 'SINGLE';
|
||||
$match = [
|
||||
'startDate' => $startDate,
|
||||
'endDate' => $endDate,
|
||||
'type' => $type,
|
||||
'state' => $this->determineMatchState($result, $detail),
|
||||
'players' => [],
|
||||
'sets' => $sourceType === 'TEAM' ? $this->parseSets($detail) : [],
|
||||
'winner' => $this->determineWinner($detail, $sourceType),
|
||||
];
|
||||
|
||||
foreach ($homePlayers as $p) {
|
||||
$match['players'][] = [
|
||||
'name' => $p['name'],
|
||||
'playerNr' => $p['playerNr'],
|
||||
'side' => 'HOME',
|
||||
];
|
||||
}
|
||||
foreach ($awayPlayers as $p) {
|
||||
$match['players'][] = [
|
||||
'name' => $p['name'],
|
||||
'playerNr' => $p['playerNr'],
|
||||
'side' => 'AWAY',
|
||||
];
|
||||
}
|
||||
|
||||
// If detail parsing produced no sets, keep the structure valid by leaving it empty.
|
||||
if ($sourceType === 'TEAM' && empty($match['sets']) && $result !== null) {
|
||||
$match['sets'] = [];
|
||||
}
|
||||
|
||||
return $match;
|
||||
}
|
||||
|
||||
/**
|
||||
* group matches. Based on String (e.g. E1E1, D1D1, D1D1, E2E2, D2D2 etc.)
|
||||
*/
|
||||
function groupMatches(array $pattern, array $games): array {
|
||||
$grouped = [];
|
||||
$order = []; // to preserve first appearance order
|
||||
|
||||
foreach ($pattern as $i => $slot) {
|
||||
if (!array_key_exists($i, $games)) {
|
||||
continue;
|
||||
}
|
||||
if (!isset($grouped[$slot])) {
|
||||
$grouped[$slot] = [
|
||||
'type' => $slot,
|
||||
'sets' => []
|
||||
];
|
||||
$order[] = $slot; // remember order of first occurrence
|
||||
}
|
||||
|
||||
$grouped[$slot]['sets'][] = $games[$i];
|
||||
}
|
||||
|
||||
// rebuild ordered result
|
||||
$result = [];
|
||||
foreach ($order as $slot) {
|
||||
$result[] = $grouped[$slot];
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
function run(): void
|
||||
{
|
||||
set_time_limit(0);
|
||||
$db = $this->db;
|
||||
$export = [
|
||||
'meta' => [
|
||||
// Keep the organization value explicit, or replace it from settings if available.
|
||||
'organisation' => 'TFVSH',
|
||||
],
|
||||
'seasons' => [],
|
||||
];
|
||||
|
||||
// Seasons
|
||||
$seasonSql = $db->getQuery(true)
|
||||
->select(['saison_id', 'saisonbezeichnung'])
|
||||
->from($db->quoteName('#__sportsmanager_saison'))
|
||||
->order('saisonbezeichnung ASC, saison_id ASC');
|
||||
|
||||
if ($this->exportSeasonId !== null) {
|
||||
$seasonSql->where('saison_id = ' . (int)$this->exportSeasonId);
|
||||
}
|
||||
|
||||
$db->setQuery($seasonSql);
|
||||
$seasons = $db->loadObjectList();
|
||||
|
||||
foreach ($seasons as $season) {
|
||||
$seasonNode = [
|
||||
'name' => (string)$season->saisonbezeichnung,
|
||||
'events' => [],
|
||||
];
|
||||
|
||||
/**
|
||||
* Event type 1: turniere
|
||||
*/
|
||||
$turnierSql = $db->getQuery(true)
|
||||
->select([
|
||||
't.turnier_id',
|
||||
't.turnierbezeichnung',
|
||||
't.erster_tag',
|
||||
't.letzter_tag',
|
||||
])
|
||||
->from($db->quoteName('#__sportsmanager_turnier', 't'))
|
||||
->where('t.saison_id = ' . (int)$season->saison_id)
|
||||
->order('t.erster_tag ASC, t.turnier_id ASC');
|
||||
|
||||
$db->setQuery($turnierSql);
|
||||
$turniere = $db->loadObjectList();
|
||||
|
||||
foreach ($turniere as $turnier) {
|
||||
$eventNode = [
|
||||
'name' => (string)$turnier->turnierbezeichnung,
|
||||
'disciplines' => [],
|
||||
];
|
||||
|
||||
$discSql = $db->getQuery(true)
|
||||
->select([
|
||||
'd.turnierdisziplin_id',
|
||||
'd.disziplin',
|
||||
'd.kuerzel',
|
||||
'd.beginn',
|
||||
])
|
||||
->from($db->quoteName('#__sportsmanager_turnierdisziplin', 'd'))
|
||||
->where('d.turnier_id = ' . (int)$turnier->turnier_id)
|
||||
->order('d.reihenfolge ASC, d.turnierdisziplin_id ASC');
|
||||
|
||||
$db->setQuery($discSql);
|
||||
$disciplines = $db->loadObjectList();
|
||||
|
||||
foreach ($disciplines as $disc) {
|
||||
$disciplineNode = [
|
||||
'name' => (string)$disc->disziplin,
|
||||
'shortName' => $this->disciplineShortName($disc->kuerzel, $disc->disziplin),
|
||||
'stages' => [],
|
||||
];
|
||||
|
||||
$spielSql = $db->getQuery(true)
|
||||
->select([
|
||||
'ts.turnierspiel_id',
|
||||
'ts.turnierdisziplin_id',
|
||||
'ts.spiel_nummer',
|
||||
'ts.runde',
|
||||
'ts.rundenstufe',
|
||||
'ts.heim_meldung_id',
|
||||
'ts.gast_meldung_id',
|
||||
'ts.ergebnis',
|
||||
'ts.ergebnis_detailliert',
|
||||
'hm.meldungsgruppe_id AS heim_meldungsgruppe_id',
|
||||
'gm.meldungsgruppe_id AS gast_meldungsgruppe_id',
|
||||
])
|
||||
->from($db->quoteName('#__sportsmanager_turnierspiel', 'ts'))
|
||||
->leftJoin($db->quoteName('#__sportsmanager_turniermeldung', 'hm') . ' ON hm.turniermeldung_id = ts.heim_meldung_id')
|
||||
->leftJoin($db->quoteName('#__sportsmanager_turniermeldung', 'gm') . ' ON gm.turniermeldung_id = ts.gast_meldung_id')
|
||||
->where('ts.turnierdisziplin_id = ' . (int)$disc->turnierdisziplin_id)
|
||||
->order('COALESCE(ts.rundenstufe, 99) ASC, COALESCE(ts.runde, 99) ASC, COALESCE(ts.spiel_nummer, 99) ASC, ts.turnierspiel_id ASC');
|
||||
|
||||
$db->setQuery($spielSql);
|
||||
$spiele = $db->loadObjectList();
|
||||
|
||||
$stages = [];
|
||||
foreach ($spiele as $spiel) {
|
||||
$rundenstufe = (int)($spiel->rundenstufe ?? 0);
|
||||
|
||||
if ($rundenstufe === 10) {
|
||||
$stageName = 'Vorrunde';
|
||||
$groupName = 'Vorrunde';
|
||||
} elseif (in_array($rundenstufe, [1, 2, 3], true)) {
|
||||
$stageName = 'Hauptrunde';
|
||||
$groupName = match ($rundenstufe) {
|
||||
1 => 'Profifeld',
|
||||
2 => 'Amateurfeld',
|
||||
3 => 'Hobbyfeld',
|
||||
};
|
||||
} else {
|
||||
$stageName = 'Stage A';
|
||||
$groupName = 'Group A';
|
||||
}
|
||||
|
||||
$groupKey = $stageName . '|' . $groupName;
|
||||
|
||||
if (!isset($stages[$stageName])) {
|
||||
$stages[$stageName] = [];
|
||||
}
|
||||
if (!isset($stages[$stageName][$groupKey])) {
|
||||
$stages[$stageName][$groupKey] = [
|
||||
'name' => $groupName,
|
||||
'rounds' => [],
|
||||
'_dates' => [],
|
||||
];
|
||||
}
|
||||
|
||||
$homePlayers = $this->getMeldungPlayers($db, (int)$spiel->heim_meldung_id, $this->meldungsPlayersCache, $this->playerCache);
|
||||
$awayPlayers = $this->getMeldungPlayers($db, (int)$spiel->gast_meldung_id, $this->meldungsPlayersCache, $this->playerCache);
|
||||
|
||||
$homeName = $this->buildSideName($homePlayers);
|
||||
$awayName = $this->buildSideName($awayPlayers);
|
||||
|
||||
$startDate = $this->isoUtc((string)$disc->beginn, $this->sourceTz, $this->outputTz) ?: $this->isoUtc($turnier->erster_tag . ' 00:00:00', $this->sourceTz, $this->outputTz);
|
||||
$endDate = $this->isoUtc((string)$disc->beginn, $this->sourceTz, $this->outputTz) ?: $this->isoUtc($turnier->letzter_tag . ' 23:59:59', $this->sourceTz, $this->outputTz);
|
||||
|
||||
$match = $this->buildMatch(
|
||||
$homePlayers,
|
||||
$awayPlayers,
|
||||
$startDate,
|
||||
$endDate,
|
||||
$spiel->ergebnis !== null ? (int)$spiel->ergebnis : null,
|
||||
[$spiel->ergebnis ?? null],
|
||||
'TURNIER'
|
||||
);
|
||||
|
||||
$roundIndex = $spiel->runde ?? 1;
|
||||
$roundKey = (string)$roundIndex;
|
||||
|
||||
if (!isset($stages[$stageName][$groupKey]['rounds'][$roundKey])) {
|
||||
$stages[$stageName][$groupKey]['rounds'][$roundKey] = [
|
||||
'index' => $roundIndex,
|
||||
'name' => 'Round ' . $roundIndex,
|
||||
'matchdays' => [],
|
||||
];
|
||||
}
|
||||
|
||||
$matchdayName = 'Day ' . (int)($spiel->spiel_nummer ?: $spiel->turnierspiel_id);
|
||||
$stages[$stageName][$groupKey]['rounds'][$roundKey]['matchdays'][] = [
|
||||
'name' => $matchdayName,
|
||||
'startDate' => $startDate,
|
||||
'endDate' => $endDate,
|
||||
'teamHome' => ['name' => $homeName],
|
||||
'teamAway' => ['name' => $awayName],
|
||||
'matches' => [$match],
|
||||
];
|
||||
|
||||
$stages[$stageName][$groupKey]['_dates'][] = $turnier->letzter_tag ?: $turnier->erster_tag;
|
||||
}
|
||||
|
||||
foreach ($stages as $stageName => $groupBucket) {
|
||||
$stageNode = [
|
||||
'name' => $stageName,
|
||||
'groups' => [],
|
||||
];
|
||||
|
||||
foreach ($groupBucket as $groupKey => $groupData) {
|
||||
$cutoffDate = null;
|
||||
if (!empty($groupData['_dates'])) {
|
||||
$cutoffDate = max($groupData['_dates']);
|
||||
}
|
||||
|
||||
$groupNode = [
|
||||
'name' => $groupData['name'],
|
||||
'tournamentMode' => 'unknown',
|
||||
'state' => $this->determineFinishedState($cutoffDate),
|
||||
'rounds' => [],
|
||||
];
|
||||
|
||||
ksort($groupData['rounds'], SORT_NATURAL);
|
||||
foreach ($groupData['rounds'] as $round) {
|
||||
$groupNode['rounds'][] = $round;
|
||||
}
|
||||
|
||||
$stageNode['groups'][] = $groupNode;
|
||||
}
|
||||
|
||||
$disciplineNode['stages'][] = $stageNode;
|
||||
}
|
||||
|
||||
$eventNode['disciplines'][] = $disciplineNode;
|
||||
}
|
||||
|
||||
$seasonNode['events'][] = $eventNode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Event type 2: team-based events from veranstaltung via team/begegnung/teamspiel
|
||||
*/
|
||||
$veranstaltungSql = $db->getQuery(true)
|
||||
->select([
|
||||
'v.veranstaltung_id',
|
||||
'v.bezeichnung',
|
||||
'v.erster_tag',
|
||||
'v.letzter_tag',
|
||||
'tsm.modus AS modus'
|
||||
])
|
||||
->from($db->quoteName('#__sportsmanager_veranstaltung', 'v'))
|
||||
->innerJoin($db->quoteName('#__sportsmanager_team', 'tm') . ' ON tm.veranstaltung_id = v.veranstaltung_id')
|
||||
->leftJoin($db->quoteName('#__sportsmanager_teamspiel_modus', 'tsm') . ' ON tsm.teamspiel_modus_id = v.modus_id')
|
||||
->where('v.saison_id = ' . (int)$season->saison_id)
|
||||
->group('v.veranstaltung_id, v.bezeichnung, v.erster_tag, v.letzter_tag')
|
||||
->order('v.erster_tag, v.veranstaltung_id');
|
||||
|
||||
$db->setQuery($veranstaltungSql);
|
||||
$veranstaltungen = $db->loadObjectList();
|
||||
|
||||
foreach ($veranstaltungen as $veranstaltung) {
|
||||
|
||||
$modus = array_map('trim', explode(',', $veranstaltung->modus));
|
||||
|
||||
$eventNode = [
|
||||
'name' => (string)$veranstaltung->bezeichnung,
|
||||
'disciplines' => [
|
||||
[
|
||||
'name' => 'Teamspiel',
|
||||
'shortName' => 'TS',
|
||||
'stages' => [
|
||||
[
|
||||
'name' => 'Stage A',
|
||||
'groups' => [],
|
||||
],
|
||||
],
|
||||
],
|
||||
],
|
||||
];
|
||||
|
||||
$groupNode = [
|
||||
'name' => 'Group A',
|
||||
'tournamentMode' => 'unknown',
|
||||
'state' => 'PLANNED',
|
||||
'rounds' => [],
|
||||
];
|
||||
|
||||
$begegnungSql = $db->getQuery(true)
|
||||
->select([
|
||||
'b.begegnung_id',
|
||||
'b.heim_team_id',
|
||||
'b.gast_team_id',
|
||||
'b.zeitpunkt',
|
||||
'b.spieltag',
|
||||
'b.spieltag_titel',
|
||||
'b.spiel_nr',
|
||||
])
|
||||
->from($db->quoteName('#__sportsmanager_begegnung', 'b'))
|
||||
->innerJoin($db->quoteName('#__sportsmanager_team', 'th') . ' ON th.team_id = b.heim_team_id')
|
||||
->innerJoin($db->quoteName('#__sportsmanager_team', 'tg') . ' ON tg.team_id = b.gast_team_id')
|
||||
->where('th.veranstaltung_id = ' . (int)$veranstaltung->veranstaltung_id)
|
||||
->order('COALESCE(b.spieltag, 9999) ASC, b.zeitpunkt ASC, b.begegnung_id ASC');
|
||||
|
||||
$db->setQuery($begegnungSql);
|
||||
$begegnungen = $db->loadObjectList();
|
||||
|
||||
$groupDates = [];
|
||||
$roundsByKey = [];
|
||||
|
||||
foreach ($begegnungen as $begegnung) {
|
||||
$homeTeamId = (int)$begegnung->heim_team_id;
|
||||
$awayTeamId = (int)$begegnung->gast_team_id;
|
||||
|
||||
if (!isset($this->teamCache[$homeTeamId])) {
|
||||
$db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select(['team_id', 'teamname'])
|
||||
->from($db->quoteName('#__sportsmanager_team'))
|
||||
->where('team_id = ' . $homeTeamId)
|
||||
);
|
||||
$this->teamCache[$homeTeamId] = $db->loadObject();
|
||||
}
|
||||
if (!isset($this->teamCache[$awayTeamId])) {
|
||||
$db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select(['team_id', 'teamname'])
|
||||
->from($db->quoteName('#__sportsmanager_team'))
|
||||
->where('team_id = ' . $awayTeamId)
|
||||
);
|
||||
$this->teamCache[$awayTeamId] = $db->loadObject();
|
||||
}
|
||||
|
||||
$homeTeam = $this->teamCache[$homeTeamId];
|
||||
$awayTeam = $this->teamCache[$awayTeamId];
|
||||
|
||||
$roundIndex = $begegnung->spieltag ?? 1;
|
||||
$roundKey = (string)$roundIndex;
|
||||
if (!isset($roundsByKey[$roundKey])) {
|
||||
$roundsByKey[$roundKey] = [
|
||||
'index' => $roundIndex,
|
||||
'name' => 'Round ' . $roundIndex,
|
||||
'matchdays' => [],
|
||||
];
|
||||
}
|
||||
|
||||
$teamspielSql = $db->getQuery(true)
|
||||
->select([
|
||||
'ts.teamspiel_id',
|
||||
'ts.teamspiel_nummer',
|
||||
'ts.heim_spieler_1_id',
|
||||
'ts.heim_spieler_2_id',
|
||||
'ts.gast_spieler_1_id',
|
||||
'ts.gast_spieler_2_id',
|
||||
'ts.teamspiel_heim_punkte',
|
||||
'ts.teamspiel_gast_punkte',
|
||||
'ts.teamspiel_heim_spielpunkte',
|
||||
'ts.teamspiel_gast_spielpunkte',
|
||||
'ts.ergebnis_detailliert',
|
||||
])
|
||||
->from($db->quoteName('#__sportsmanager_teamspiel', 'ts'))
|
||||
->where('ts.begegnung_id = ' . (int)$begegnung->begegnung_id)
|
||||
->order('ts.teamspiel_nummer ASC, ts.teamspiel_id ASC');
|
||||
|
||||
$db->setQuery($teamspielSql);
|
||||
$teamspiele = $db->loadObjectList();
|
||||
|
||||
$matchdayMatches = [];
|
||||
$teamspiele = $this->groupMatches($modus, $teamspiele);
|
||||
foreach ($teamspiele as $group) {
|
||||
if (empty($group['sets'])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$ts = $group['sets'][0];
|
||||
// use modus here
|
||||
$homePlayers = [];
|
||||
$awayPlayers = [];
|
||||
|
||||
$homePlayers[] = $this->getPersonForSpieler($db, (int)$ts->heim_spieler_1_id, null, $this->playerCache);
|
||||
if (!empty($ts->heim_spieler_2_id)) {
|
||||
$homePlayers[] = $this->getPersonForSpieler($db, (int)$ts->heim_spieler_2_id, null, $this->playerCache);
|
||||
}
|
||||
|
||||
$awayPlayers[] = $this->getPersonForSpieler($db, (int)$ts->gast_spieler_1_id, null, $this->playerCache);
|
||||
if (!empty($ts->gast_spieler_2_id)) {
|
||||
$awayPlayers[] = $this->getPersonForSpieler($db, (int)$ts->gast_spieler_2_id, null, $this->playerCache);
|
||||
}
|
||||
|
||||
$startDate = $this->isoUtc($begegnung->zeitpunkt, $this->sourceTz, $this->outputTz);
|
||||
$endDate = $this->isoUtc($begegnung->zeitpunkt, $this->sourceTz, $this->outputTz);
|
||||
|
||||
$detail = [];
|
||||
foreach ($group['sets'] as $set) {
|
||||
$detail[] = $set->ergebnis_detailliert ?? null;
|
||||
}
|
||||
|
||||
$matchdayMatches[] = $this->buildMatch(
|
||||
$homePlayers,
|
||||
$awayPlayers,
|
||||
$startDate,
|
||||
$endDate,
|
||||
($ts->teamspiel_heim_punkte !== null || $ts->teamspiel_gast_punkte !== null) ? 1 : null,
|
||||
$detail,
|
||||
'TEAM'
|
||||
);
|
||||
}
|
||||
|
||||
$matchdayName = trim((string)$begegnung->spieltag_titel) !== ''
|
||||
? (string)$begegnung->spieltag_titel
|
||||
: ('Spieltag ' . $roundIndex);
|
||||
|
||||
$roundsByKey[$roundKey]['matchdays'][] = [
|
||||
'name' => $matchdayName,
|
||||
'startDate' => $this->isoUtc($begegnung->zeitpunkt, $this->sourceTz, $this->outputTz),
|
||||
'endDate' => $this->isoUtc($begegnung->zeitpunkt, $this->sourceTz, $this->outputTz),
|
||||
'teamHome' => ['name' => $homeTeam->teamname ?? ('Team ' . $homeTeamId)],
|
||||
'teamAway' => ['name' => $awayTeam->teamname ?? ('Team ' . $awayTeamId)],
|
||||
'matches' => $matchdayMatches,
|
||||
];
|
||||
|
||||
$groupDates[] = substr((string)$begegnung->zeitpunkt, 0, 10);
|
||||
}
|
||||
|
||||
if (!empty($groupDates)) {
|
||||
$groupNode['state'] = $this->determineFinishedState(max($groupDates));
|
||||
}
|
||||
|
||||
ksort($roundsByKey, SORT_NATURAL);
|
||||
foreach ($roundsByKey as $round) {
|
||||
$groupNode['rounds'][] = $round;
|
||||
}
|
||||
|
||||
$eventNode['disciplines'][0]['stages'][0]['groups'][] = $groupNode;
|
||||
$seasonNode['events'][] = $eventNode;
|
||||
}
|
||||
|
||||
$export['seasons'][] = $seasonNode;
|
||||
}
|
||||
|
||||
$json = json_encode($export, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
|
||||
|
||||
if ($json === false) {
|
||||
throw new RuntimeException('JSON encoding failed: ' . json_last_error_msg());
|
||||
}
|
||||
|
||||
if ($this->outputFile) {
|
||||
file_put_contents($this->outputFile, $json . PHP_EOL);
|
||||
}
|
||||
|
||||
if (PHP_SAPI !== 'cli') {
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
}
|
||||
|
||||
echo 'Successfully created export file: ' . $this->outputFile;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -145,12 +145,6 @@ class HTML_sportsmanager_admin
|
||||
</td>
|
||||
<?php
|
||||
$Spalte_Nr = self::checkZeilenumbruch($Spalte_Nr, $max_Spalten);
|
||||
?>
|
||||
<td style="padding-right: 15px" nowrap>
|
||||
<a href="<?php echo SportsManagerURL('&task=admin_sportshub'); ?>"><?php echo 'Sportshub'; ?></a>
|
||||
</td>
|
||||
<?php
|
||||
$Spalte_Nr = self::checkZeilenumbruch($Spalte_Nr, $max_Spalten);
|
||||
}
|
||||
if (benutzerZugriff("termine_aendern")) {
|
||||
?>
|
||||
@@ -988,6 +982,21 @@ class HTML_sportsmanager_admin
|
||||
?>"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td nowrap colspan="2">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="font-weight:bold"><label for="dtfb_sync_url">DTFB Sync Einstellungen</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: right"><label for="dtfb_sync_url">Sync-URL</label></td>
|
||||
<td>
|
||||
<input name="dtfb_sync_url" id="dtfb_sync_url" type="text" size="60"
|
||||
value="<?php echo htmlspecialchars($einstellungen["dtfb_sync_url"] ?? '') ?>"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
@@ -1261,6 +1270,18 @@ class HTML_sportsmanager_admin
|
||||
href="<?php echo SportsManagerURL('&task=admin_spieler_remove_inaktive_form'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CLEANUP_INACTIVE_PLAYERS'); ?></a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td nowrap style="padding-top: 10px;">
|
||||
<a href="<?php echo SportsManagerURL('&task=admin_spieler_sync_dtfb'); ?>"
|
||||
onclick="return confirm('Spielerdaten jetzt mit DTFB synchronisieren?');"
|
||||
class="uk-button uk-button-primary uk-button-small button" style="padding: 3px 10px; font-weight: bold; background: #007bc3; color: white; border-radius: 4px; border: none; text-decoration: none; display: inline-block;">
|
||||
🔄 Sync zu DTFB
|
||||
</a>
|
||||
</td>
|
||||
<td nowrap colspan="4" style="padding-top: 10px; vertical-align: middle;">
|
||||
<small style="margin-left: 10px;">Letzter Sync: <?php echo syncGetLastStatus(); ?></small>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -411,6 +411,51 @@ class HTML_sportsmanager_ticker
|
||||
moreResults(matches, groups, day, page, 0);
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
#theme-toggle {
|
||||
float: right;
|
||||
margin-top: 15px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
.theme-btn {
|
||||
cursor: pointer;
|
||||
margin-left: 10px;
|
||||
font-size: 18px;
|
||||
opacity: 0.5;
|
||||
transition: opacity 0.2s;
|
||||
}
|
||||
.theme-btn:hover, .theme-btn.active {
|
||||
opacity: 1;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
function applyTheme(theme) {
|
||||
if (theme === 'dark' || (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
|
||||
document.body.classList.add('dark-mode');
|
||||
} else {
|
||||
document.body.classList.remove('dark-mode');
|
||||
}
|
||||
if (document.getElementById('theme-' + theme)) {
|
||||
document.querySelectorAll('.theme-btn').forEach(function(btn) { btn.classList.remove('active'); });
|
||||
document.getElementById('theme-' + theme).classList.add('active');
|
||||
}
|
||||
}
|
||||
var savedTheme = localStorage.getItem('livescore-theme') || 'auto';
|
||||
|
||||
function setTheme(theme) {
|
||||
localStorage.setItem('livescore-theme', theme);
|
||||
applyTheme(theme);
|
||||
}
|
||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', function(e) {
|
||||
if (localStorage.getItem('livescore-theme') === 'auto' || !localStorage.getItem('livescore-theme')) {
|
||||
applyTheme('auto');
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
applyTheme(localStorage.getItem('livescore-theme') || 'auto');
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body onResize="resizee()">
|
||||
@@ -433,6 +478,11 @@ class HTML_sportsmanager_ticker
|
||||
<div id="left_page_header">
|
||||
<h1 id="pagetitle_text">LIVE-TICKER</h1>
|
||||
</div>
|
||||
<div id="theme-toggle">
|
||||
<span id="theme-auto" class="theme-btn" onclick="setTheme('auto')" title="Auto Theme">💻</span>
|
||||
<span id="theme-light" class="theme-btn" onclick="setTheme('light')" title="Light Theme">☀️</span>
|
||||
<span id="theme-dark" class="theme-btn" onclick="setTheme('dark')" title="Dark Theme">🌙</span>
|
||||
</div>
|
||||
<a href="<?php echo SportsManagerURL(); ?>" id="homeicon">Home</a>
|
||||
<div style="clear:both;"></div>
|
||||
<div id="left_menu">
|
||||
@@ -1838,6 +1888,99 @@ class HTML_sportsmanager_ticker
|
||||
height: 39px;
|
||||
}
|
||||
}
|
||||
|
||||
body.dark-mode {
|
||||
background: #121212;
|
||||
}
|
||||
body.dark-mode #right_page {
|
||||
background: #1e1e1e;
|
||||
}
|
||||
body.dark-mode h1#pagetitle_text {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode a#homeicon {
|
||||
color: #cccccc;
|
||||
}
|
||||
body.dark-mode #left_menu ul li a {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode #tbl th {
|
||||
color: #eeeeee;
|
||||
background-color: #333333;
|
||||
}
|
||||
body.dark-mode #tbl tr td {
|
||||
color: #dddddd;
|
||||
}
|
||||
body.dark-mode #detailedresults #tbl tr.odd td {
|
||||
background-color: #242424;
|
||||
}
|
||||
body.dark-mode #detailedresults #tbl tr.even td {
|
||||
background-color: #2a2a2a;
|
||||
}
|
||||
body.dark-mode #tbl tr.tablehead td {
|
||||
background-color: #333333;
|
||||
}
|
||||
body.dark-mode tr.finished.odd {
|
||||
background-color: #2a2a2a;
|
||||
}
|
||||
body.dark-mode tr.finished.even {
|
||||
background-color: #2e2e2e;
|
||||
}
|
||||
body.dark-mode tr.updated {
|
||||
background-color: #2d2616;
|
||||
}
|
||||
body.dark-mode tr.livenow {
|
||||
background-color: #173824;
|
||||
}
|
||||
body.dark-mode tr.upcoming.odd {
|
||||
background-color: #1a222f;
|
||||
}
|
||||
body.dark-mode tr.upcoming.even {
|
||||
background-color: #1e2a3b;
|
||||
}
|
||||
body.dark-mode #tbl tr td.finished_winner {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode tr.last_row {
|
||||
background-color: #333333;
|
||||
}
|
||||
body.dark-mode #tbl tr td#last_row {
|
||||
background-color: #333333;
|
||||
}
|
||||
body.dark-mode tr.upcoming.odd #resultat_holder,
|
||||
body.dark-mode tr.upcoming.even #resultat_holder {
|
||||
color: #eeeeee;
|
||||
}
|
||||
body.dark-mode #sponsorz {
|
||||
background: #333333;
|
||||
}
|
||||
body.dark-mode .grey_button {
|
||||
background: #333333;
|
||||
}
|
||||
body.dark-mode .grey_button a {
|
||||
color: #eeeeee;
|
||||
}
|
||||
body.dark-mode .place_final {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode .field_score {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode .field_team {
|
||||
color: #dddddd;
|
||||
}
|
||||
body.dark-mode .field_team.winner_bold {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode #winner_area_positions span {
|
||||
color: #dddddd;
|
||||
}
|
||||
body.dark-mode #winner_area_positions span#winner {
|
||||
color: #ffffff;
|
||||
}
|
||||
body.dark-mode #winner_area_positions span#winner_name {
|
||||
color: #ffffff;
|
||||
}
|
||||
<?php
|
||||
}
|
||||
|
||||
|
||||
@@ -1274,7 +1274,28 @@ 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 = '120';";
|
||||
$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '121';";
|
||||
$db->setQuery( $query );
|
||||
if (!$db->execute()) { die($db->stderr(true)); }
|
||||
|
||||
$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_sync_log` ("
|
||||
. "\n `sync_id` INT(11) NOT NULL AUTO_INCREMENT,"
|
||||
. "\n `sync_timestamp` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,"
|
||||
. "\n `sync_direction` ENUM('push', 'receive') NOT NULL,"
|
||||
. "\n `sync_trigger` ENUM('manual', 'cron', 'api') NOT NULL,"
|
||||
. "\n `sync_status` ENUM('success', 'error') NOT NULL,"
|
||||
. "\n `spieler_count` INT(11) DEFAULT 0,"
|
||||
. "\n `spieler_updated` INT(11) DEFAULT 0,"
|
||||
. "\n `spieler_added` INT(11) DEFAULT 0,"
|
||||
. "\n `message` TEXT,"
|
||||
. "\n `details` TEXT,"
|
||||
. "\n PRIMARY KEY (`sync_id`),"
|
||||
. "\n INDEX `idx_timestamp` (`sync_timestamp`)"
|
||||
. "\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
|
||||
$db->setQuery( $query );
|
||||
if (!$db->execute()) { die($db->stderr(true)); }
|
||||
|
||||
$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'dtfb_sync_url', wert = '';";
|
||||
$db->setQuery( $query );
|
||||
if (!$db->execute()) { die($db->stderr(true)); }
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
# DTFB Player Sync — QA findings & applied fixes
|
||||
|
||||
Concise record of the defects found while reviewing the player-sync receiver
|
||||
(`syncReceiveSpielerImport()` in `sync.php`) and the six fixes applied in this PR.
|
||||
The exploratory test harness used to find these has been removed — the
|
||||
authoritative next test is the **staging end-to-end sync** (see the PR description).
|
||||
|
||||
## The six issues fixed
|
||||
|
||||
| # | Issue | Impact | Fix in `sync.php` |
|
||||
|---|-------|--------|-------------------|
|
||||
| 1 | **Receiver did not normalise input encoding.** A latin1 / Windows-1252 CSV (the legacy manual export) has `ß` as the single byte `0xDF`. Staging the org name into the utf8mb4 table truncated it at that byte, so the org lookup missed and **every row was skipped**. | Critical — silent data loss (e.g. 2964 rows parsed, 0 imported, `success=true`). | Transcode the payload to UTF-8 when it is not already valid UTF-8, before staging. |
|
||||
| 2 | **A zero-effect import reported success.** When N rows parsed but nothing was added or updated, the function returned `success=true`. | Critical — masks encoding/mapping failures. | Return `success=false` with a diagnostic message when `rows>0` but `added==0 && updated==0`. |
|
||||
| 3 | **Dead `$naechste_spielernr` block** referenced an undefined variable in the insert branch. | Runtime notice; incoming rows already carry their Passnummer. | Removed the block. |
|
||||
| 4 | **Unconditional mass-deactivation.** A partial CSV deactivated every member not listed. | High — a broken/partial export could wipe an org's roster. | Per organisation, skip the deactivation sweep when the incoming count is below `sync_deactivation_min_ratio` (default 0.5) of the org's currently-active members; adds/updates still proceed and a warning is returned. |
|
||||
| 5 | **Split clock for staging.** `session_id` came from PHP `date()` while stale-row cleanup used MySQL `NOW()`; a PHP/MySQL timezone gap could delete in-flight staging rows. | Medium — another silent 0-row path. | Derive `session_id` from the DB clock (`NOW()`), with `date()` fallback. |
|
||||
| 6 | **No Passnummer format check.** The manual import UI enforces `^[0-9]{2}-[0-9]{4,6}$`; the sync receiver did not. | Medium — inconsistent data quality vs the manual flow. | Apply the same regex to `spielernr` / `spielernr_alt` (blank/reject on mismatch). |
|
||||
|
||||
## Confirmed by design (not bugs)
|
||||
- **No contact / personal data** (email, phone, address) is ever exported or imported.
|
||||
- Existing players keep their `lizenznr` and `geburtsjahr` on update; only name / sex / Passnummer-driven fields change.
|
||||
- An unknown organisation aborts the whole import with no mutation.
|
||||
- The sync path itself (export → cURL push → receive) is UTF-8 end-to-end; the encoding defect (#1) only affected ingesting a legacy latin1 *manual* file.
|
||||
Reference in New Issue
Block a user