kickern/com_sportsmanager
1
0
Fork 0
mirror of https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git synced 2026-06-10 06:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into production

Browse Source 
# Conflicts:
#	src/structure/language/de-DE/de-DE.com_sportsmanager.ini
This commit is contained in:
Helmut Poppen
2024-11-15 13:19:57 +01:00
parent 935f8ef7d8 2c3fef03fb
commit 322906ff70
4 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/dtfbstage.yml
+23
View File
@@ -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 }}
.github/workflows/kickernstage.yml
+23
View File
@@ -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
path: src/structure/
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 }}
src/structure/components/com_sportsmanager/admin.php
+4 -4
View File
@@ -3226,8 +3226,8 @@ function adminImportSpieler() {
if ($spieler_id != null) { // Spieler aktualisieren if ($spieler_id != null) { // Spieler aktualisieren
$query = "UPDATE #__sportsmanager_spieler" $query = "UPDATE #__sportsmanager_spieler"
. "\n SET vorname = '" . $db->escape($vorname) . "'," . "\n SET vorname = '" . $db->escape($vorname) . "',"
. "\n nachname = '" . $db->escape($nachname) . "'," . "\n nachname = '" . $db->escape($nachname) . "',";
. "\n spielernr = '" . $db->escape($spielernr) . "'"; //. "\n spielernr = '" . $db->escape($spielernr) . "'";
if (isset($spalten["lizenznr"]) && ($lizenznr_beibehalten == 0 || !empty($lizenznr))) if (isset($spalten["lizenznr"]) && ($lizenznr_beibehalten == 0 || !empty($lizenznr)))
$query .= ",\n lizenznr = '" . $db->escape($lizenznr) . "'"; $query .= ",\n lizenznr = '" . $db->escape($lizenznr) . "'";
if (isset($spalten["pseudonym"])) if (isset($spalten["pseudonym"]))
@@ -6225,8 +6225,8 @@ function adminKopierenRangliste() {
if (count($rows) < 1) die("Wrong id!"); if (count($rows) < 1) die("Wrong id!");
$rangliste = $rows[0]; $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)" $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->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) . "');"; . "\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); $db->setQuery($query);
if (!$result = $db->execute()) { if (!$result = $db->execute()) {
die($db->stderr(true)); die($db->stderr(true));
src/structure/language/de-DE/de-DE.com_sportsmanager.ini
+1 -1
View File
@@ -1,4 +1,4 @@
; Sports Manager (C) 2006-2020, Sven Nickel TEST ; Sports Manager (C) 2006-2020, Sven Nickel (Test)
COM_SPORTSMANAGER="Sports Manager" COM_SPORTSMANAGER="Sports Manager"
COM_SPORTSMANAGER_PLAYERS="Spieler" COM_SPORTSMANAGER_PLAYERS="Spieler"
COM_SPORTSMANAGER_CLUBS="Vereine" COM_SPORTSMANAGER_CLUBS="Vereine"