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 }} + diff --git a/.github/workflows/kickernstage.yml b/.github/workflows/kickernstage.yml new file mode 100644 index 0000000..921ffbc --- /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 + 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 }} + diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 2aba5dd..a5ec86d 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -3226,8 +3226,8 @@ function adminImportSpieler() { if ($spieler_id != null) { // Spieler aktualisieren $query = "UPDATE #__sportsmanager_spieler" . "\n SET vorname = '" . $db->escape($vorname) . "'," - . "\n nachname = '" . $db->escape($nachname) . "'," - . "\n spielernr = '" . $db->escape($spielernr) . "'"; + . "\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) . "'"; if (isset($spalten["pseudonym"])) @@ -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)); 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 c5c224d..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 TEST +; Sports Manager (C) 2006-2020, Sven Nickel (Test) COM_SPORTSMANAGER="Sports Manager" COM_SPORTSMANAGER_PLAYERS="Spieler" COM_SPORTSMANAGER_CLUBS="Vereine"