From 948add897878c1992b607e76a76052e5aa1fd14e Mon Sep 17 00:00:00 2001 From: marcus-fleck <60736081+marcus-fleck@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:32:35 +0100 Subject: [PATCH 01/11] =?UTF-8?q?nur=20das=20entsprechende=20db=20feld=20+?= =?UTF-8?q?=20value=20im=20insert=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/structure/components/com_sportsmanager/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 2aba5dd..0df3a15 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -6225,8 +6225,8 @@ function adminKopierenRangliste() { if (count($rows) < 1) die("Wrong id!"); $rangliste = $rows[0]; - $query = "INSERT INTO #__sportsmanager_rangliste (saison_id, system_id, streichergebnisse, geschlecht, minalter, maxalter, ohnealter, bezeichnung, erster_tag, letzter_tag, status, reihenfolge, kategorie)" - . "\n VALUES ('$rangliste->saison_id', " . ($rangliste->system_id == null ? "null" : "'$rangliste->system_id'") . ", '" . $db->escape($rangliste->streichergebnisse) . "', " . ($rangliste->geschlecht == null ? "null" : "'$rangliste->geschlecht'") . ", " . ($rangliste->minalter == null ? "null" : "'$rangliste->minalter'") . ", " . ($rangliste->maxalter == null ? "null" : "'$rangliste->maxalter'") . ", '$rangliste->ohnealter', '" . $db->escape($rangliste->bezeichnung . " (Kopie)") . "', '" . $db->escape($rangliste->erster_tag) . "', '" . $db->escape($rangliste->letzter_tag) . "', '0', '" . $db->escape($rangliste->reihenfolge) . "', '" . $db->escape($rangliste->kategorie) . "');"; + $query = "INSERT INTO #__sportsmanager_rangliste (saison_id, system_id, streichergebnisse, geschlecht, lizenzen, minalter, maxalter, ohnealter, bezeichnung, erster_tag, letzter_tag, status, reihenfolge, kategorie)" + . "\n VALUES ('$rangliste->saison_id', " . ($rangliste->system_id == null ? "null" : "'$rangliste->system_id'") . ", '" . $db->escape($rangliste->streichergebnisse) . "', " . ($rangliste->geschlecht == null ? "null" : "'$rangliste->geschlecht'") . ", " . ($rangliste->lizenzen == null ? "null" : "'$rangliste->lizenzen'") . "," . ($rangliste->minalter == null ? "null" : "'$rangliste->minalter'") . ", " . ($rangliste->maxalter == null ? "null" : "'$rangliste->maxalter'") . ", '$rangliste->ohnealter', '" . $db->escape($rangliste->bezeichnung . " (Kopie)") . "', '" . $db->escape($rangliste->erster_tag) . "', '" . $db->escape($rangliste->letzter_tag) . "', '0', '" . $db->escape($rangliste->reihenfolge) . "', '" . $db->escape($rangliste->kategorie) . "');"; $db->setQuery($query); if (!$result = $db->execute()) { die($db->stderr(true)); From c954eca13c2c2aaf71e9cb54d4c6bccf381cdf69 Mon Sep 17 00:00:00 2001 From: Paul Fleischanderl Date: Thu, 18 Jul 2024 17:17:17 +0200 Subject: [PATCH 02/11] remove update on spieler_nr on funktion Spieler importieren --- src/structure/components/com_sportsmanager/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 2aba5dd..0267bf9 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -3227,7 +3227,7 @@ function adminImportSpieler() { $query = "UPDATE #__sportsmanager_spieler" . "\n SET vorname = '" . $db->escape($vorname) . "'," . "\n nachname = '" . $db->escape($nachname) . "'," - . "\n spielernr = '" . $db->escape($spielernr) . "'"; + //. "\n spielernr = '" . $db->escape($spielernr) . "'"; if (isset($spalten["lizenznr"]) && ($lizenznr_beibehalten == 0 || !empty($lizenznr))) $query .= ",\n lizenznr = '" . $db->escape($lizenznr) . "'"; if (isset($spalten["pseudonym"])) From a41115819e37d7572cc97caaf4c1f065e26b3ec2 Mon Sep 17 00:00:00 2001 From: Paul Fleischanderl Date: Tue, 23 Jul 2024 16:58:04 +0200 Subject: [PATCH 03/11] paul test deployment on stage --- src/structure/language/de-DE/de-DE.com_sportsmanager.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 337a7b8..95804aa 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -342,7 +342,7 @@ COM_SPORTSMANAGER_JOOMLA_MANAGEMENT="Verwaltung" COM_SPORTSMANAGER_ADD_PLAYERS="Spieler hinzufügen" COM_SPORTSMANAGER_MERGING_2_PLAYERS="Zwei Spieler zusammenführen" COM_SPORTSMANAGER_IMAGE_EXPORT="Bilder exportieren" -COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren" +COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren (test)" COM_SPORTSMANAGER_PLAYERS_IMPORT="Spieler importieren" COM_SPORTSMANAGER_PLAYERS_IMPORT2="Spieler: Importieren" COM_SPORTSMANAGER_PLAYERS_EXPORT="Spieler exportieren (CSV)" From 08d093915d991a2c03f82e707b18b88eebc37291 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 19:42:13 +0200 Subject: [PATCH 04/11] Create kickernstage.yml --- .github/workflows/kickernstage.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/kickernstage.yml diff --git a/.github/workflows/kickernstage.yml b/.github/workflows/kickernstage.yml new file mode 100644 index 0000000..fe13fd1 --- /dev/null +++ b/.github/workflows/kickernstage.yml @@ -0,0 +1,23 @@ +name: Deploy dev branch to stage.kickern-hamburg.de +on: + push: + branches: ['dev'] + paths: ['src/structure/**'] + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: rsync deployments + uses: burnett01/rsync-deployments@7.0.1 + with: + switches: -avzr --delete + path: src/ + remote_path: ${{ secrets.KICKERN_STAGE_PATH }} + remote_host: ${{ secrets.KICKERN_STAGE_HOST }} + remote_port: ${{ secrets.KICKERN_STAGE_PORT }} + remote_user: ${{ secrets.KICKERN_STAGE_USER }} + remote_key: ${{ secrets.KICKERN_STAGE_KEY }} + From 169e35fc364b487c2fdce031fb41e83548491d94 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 19:43:18 +0200 Subject: [PATCH 05/11] Update de-DE.com_sportsmanager.ini Test GHA --- src/structure/language/de-DE/de-DE.com_sportsmanager.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 95804aa..ed1a016 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -342,7 +342,7 @@ COM_SPORTSMANAGER_JOOMLA_MANAGEMENT="Verwaltung" COM_SPORTSMANAGER_ADD_PLAYERS="Spieler hinzufügen" COM_SPORTSMANAGER_MERGING_2_PLAYERS="Zwei Spieler zusammenführen" COM_SPORTSMANAGER_IMAGE_EXPORT="Bilder exportieren" -COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren (test)" +COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren (test2)" COM_SPORTSMANAGER_PLAYERS_IMPORT="Spieler importieren" COM_SPORTSMANAGER_PLAYERS_IMPORT2="Spieler: Importieren" COM_SPORTSMANAGER_PLAYERS_EXPORT="Spieler exportieren (CSV)" From fb14e3135c283d7de002fd71a037884770463611 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 19:54:57 +0200 Subject: [PATCH 06/11] Update kickernstage.yml --- .github/workflows/kickernstage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kickernstage.yml b/.github/workflows/kickernstage.yml index fe13fd1..921ffbc 100644 --- a/.github/workflows/kickernstage.yml +++ b/.github/workflows/kickernstage.yml @@ -13,8 +13,8 @@ jobs: - name: rsync deployments uses: burnett01/rsync-deployments@7.0.1 with: - switches: -avzr --delete - path: src/ + switches: -avzr + path: src/structure/ remote_path: ${{ secrets.KICKERN_STAGE_PATH }} remote_host: ${{ secrets.KICKERN_STAGE_HOST }} remote_port: ${{ secrets.KICKERN_STAGE_PORT }} From a48742b681a64ee2b1401502798c06420dfe5249 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 19:55:48 +0200 Subject: [PATCH 07/11] Update de-DE.com_sportsmanager.ini test 2 --- src/structure/language/de-DE/de-DE.com_sportsmanager.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ed1a016..95804aa 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -342,7 +342,7 @@ COM_SPORTSMANAGER_JOOMLA_MANAGEMENT="Verwaltung" COM_SPORTSMANAGER_ADD_PLAYERS="Spieler hinzufügen" COM_SPORTSMANAGER_MERGING_2_PLAYERS="Zwei Spieler zusammenführen" COM_SPORTSMANAGER_IMAGE_EXPORT="Bilder exportieren" -COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren (test2)" +COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren (test)" COM_SPORTSMANAGER_PLAYERS_IMPORT="Spieler importieren" COM_SPORTSMANAGER_PLAYERS_IMPORT2="Spieler: Importieren" COM_SPORTSMANAGER_PLAYERS_EXPORT="Spieler exportieren (CSV)" From 6995e87fe31cca060b593c1404a116fa1cd0077d Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 19:57:05 +0200 Subject: [PATCH 08/11] Update de-DE.com_sportsmanager.ini remove test --- src/structure/language/de-DE/de-DE.com_sportsmanager.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 95804aa..337a7b8 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -342,7 +342,7 @@ COM_SPORTSMANAGER_JOOMLA_MANAGEMENT="Verwaltung" COM_SPORTSMANAGER_ADD_PLAYERS="Spieler hinzufügen" COM_SPORTSMANAGER_MERGING_2_PLAYERS="Zwei Spieler zusammenführen" COM_SPORTSMANAGER_IMAGE_EXPORT="Bilder exportieren" -COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren (test)" +COM_SPORTSMANAGER_IMAGE_IMPORT="Bilder importieren" COM_SPORTSMANAGER_PLAYERS_IMPORT="Spieler importieren" COM_SPORTSMANAGER_PLAYERS_IMPORT2="Spieler: Importieren" COM_SPORTSMANAGER_PLAYERS_EXPORT="Spieler exportieren (CSV)" From c89ce6cba02de311992d255bea10e5be611fbda0 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 20:21:04 +0200 Subject: [PATCH 09/11] Create dtfbstage.yml --- .github/workflows/dtfbstage.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/dtfbstage.yml diff --git a/.github/workflows/dtfbstage.yml b/.github/workflows/dtfbstage.yml new file mode 100644 index 0000000..263ae84 --- /dev/null +++ b/.github/workflows/dtfbstage.yml @@ -0,0 +1,23 @@ +name: Deploy dev branch to stage.dtfb.de +on: + push: + branches: ['dev'] + paths: ['src/structure/**'] + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: rsync deployments + uses: burnett01/rsync-deployments@7.0.1 + with: + switches: -avzr + path: src/structure/ + remote_path: ${{ secrets.DTFB_STAGE_PATH }} + remote_host: ${{ secrets.DTFB_STAGE_HOST }} + remote_port: ${{ secrets.DTFB_STAGE_PORT }} + remote_user: ${{ secrets.DTFB_STAGE_USER }} + remote_key: ${{ secrets.DTFB_STAGE_KEY }} + From 640a6d6f26bff96113c9805a4ffaadbc8a5392f7 Mon Sep 17 00:00:00 2001 From: Stefan Wendhausen Date: Tue, 6 Aug 2024 20:35:52 +0200 Subject: [PATCH 10/11] Update de-DE.com_sportsmanager.ini Test both stage actions --- src/structure/language/de-DE/de-DE.com_sportsmanager.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 337a7b8..eed0a37 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -1,4 +1,4 @@ -; Sports Manager (C) 2006-2020, Sven Nickel +; Sports Manager (C) 2006-2020, Sven Nickel (Test) COM_SPORTSMANAGER="Sports Manager" COM_SPORTSMANAGER_PLAYERS="Spieler" COM_SPORTSMANAGER_CLUBS="Vereine" From 10cd39073d13c18f70f99bc374e43bf2fa9e9d29 Mon Sep 17 00:00:00 2001 From: Paul Fleischanderl Date: Sun, 1 Sep 2024 20:46:11 +0200 Subject: [PATCH 11/11] paul: bugfix missing semicolon after test change --- src/structure/components/com_sportsmanager/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 0267bf9..d170fd9 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -3226,7 +3226,7 @@ function adminImportSpieler() { if ($spieler_id != null) { // Spieler aktualisieren $query = "UPDATE #__sportsmanager_spieler" . "\n SET vorname = '" . $db->escape($vorname) . "'," - . "\n nachname = '" . $db->escape($nachname) . "'," + . "\n nachname = '" . $db->escape($nachname) . "',"; //. "\n spielernr = '" . $db->escape($spielernr) . "'"; if (isset($spalten["lizenznr"]) && ($lizenznr_beibehalten == 0 || !empty($lizenznr))) $query .= ",\n lizenznr = '" . $db->escape($lizenznr) . "'";