Merge pull request #267 from Deutscher-Tischfussballbund/sportsmanager2-stage

stage to prod

.github/release-drafter_extension.yml

@@ -0,0 +1,25 @@
+name-template: "Release $COMPLETE"
+tag-template: "v$COMPLETE"
+draft: false
+
+exclude:
+  pulls: true
+exclude-labels:
+  - changelog-ignore
+  
+categories:
+  - title: "Features"
+    labels: ["feature", "enhancement"]
+  - title: "Fixes"
+    labels: ["bug"]
+  - title: "Maintenance"
+    labels: ["chore", "refactor"]
+
+change-template: "- $TITLE [#$NUMBER]"
+
+template: |
+  # Release $RESOLVED_VERSION
+
+  ## Changes
+
+  $CHANGES

.github/release-drafter_github.yml

@@ -0,0 +1,23 @@
+name-template: "Release $COMPLETE"
+tag-template: "v$COMPLETE"
+draft: false
+
+exclude:
+  pulls: true
+exclude-labels:
+  - changelog-ignore
+  
+categories:
+  - title: "Features"
+    labels: ["feature", "enhancement"]
+  - title: "Fixes"
+    labels: ["bug"]
+  - title: "Maintenance"
+    labels: ["chore", "refactor"]
+
+change-template: "- $TITLE [#$NUMBER]"
+
+template: |
+  ## Changes
+
+  $CHANGES

.github/workflows/autolabel.yaml

@@ -0,0 +1,25 @@
+name: Auto-label PRs
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, edited]
+
+jobs:
+  label-changelog-ignore:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Label PRs
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const base = context.payload.pull_request.base.ref;
+            const head = context.payload.pull_request.head.ref;
+
+            if ((base === 'sportsmanager2-prod' && head === 'sportsmanager2-stage') || (base === 'sportsmanager2-stage' && head === 'sportsmanager2-dev')) {
+              await github.rest.issues.addLabels({
+                ...context.repo,
+                issue_number: context.payload.pull_request.number,
+                labels: ['changelog-ignore']
+              });
+            }

.github/workflows/build_release.yml

@@ -0,0 +1,100 @@
+# This workflow will run release using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Sportsmanager Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+' # run only on version tags like v1.0.0
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: sportsmanager2-prod
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Get version from git tag
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Set DATE
+        run: echo "DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      - name: Update version.php
+        run: |
+          echo "<?php" > src/structure/components/com_sportsmanager/util/version.php
+          echo "defined('_JEXEC') or die;" >> src/structure/components/com_sportsmanager/util/version.php
+          echo "return [" >> src/structure/components/com_sportsmanager/util/version.php
+          echo "    'version' => '${{ env.VERSION }}'," >> src/structure/components/com_sportsmanager/util/version.php
+          echo "    'date' => '$(date +%F)'," >> src/structure/components/com_sportsmanager/util/version.php
+          echo "];" >> src/structure/components/com_sportsmanager/util/version.php
+          echo "Updating version to $VERSION in sportsmanager.xml"
+          sed -i "s#<version>.*</version>#<version>$VERSION</version>#" src/structure/sportsmanager.xml
+          echo "Updating Date to $DATE in sportsmanager.xml"
+          sed -i "s#<creationDate>.*</creationDate>#<creationDate>$DATE</creationDate>#" src/structure/sportsmanager.xml
+
+      - name: Generate release notes
+        id: release_notes_extension
+        uses: release-drafter/release-drafter@v6
+        with:
+          config-name: release-drafter_extension.yml
+          version: ${{ github.ref_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Save release notes to file
+        run: |
+          echo "${{ steps.release_notes_extension.outputs.body }}" > RELEASE_NOTES.md
+
+      - name: Run build script
+        run: npm run release
+
+      - name: Generate release notes
+        id: release_notes_github
+        uses: release-drafter/release-drafter@v6
+        with:
+          config-name: release-drafter_github.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Save release notes to file
+        run: |
+          echo "${{ steps.release_notes_github.outputs.body }}" > RELEASE_NOTES.md
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: "${{ github.ref_name }}"
+          name: "Release ${{ github.ref_name }}"
+          files: package/packages/com_sportsmanager.zip
+          body_path: "RELEASE_NOTES.md"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Delete draft release via API # workaround: remove leftover draft by release-drafter
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+        run: |
+          drafts=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+            https://api.github.com/repos/$REPO/releases | jq '.[] | select(.draft == true)')
+
+          if [ -n "$drafts" ]; then
+            id=$(echo "$drafts" | jq -r '.id')
+            curl -s -X DELETE -H "Authorization: token $GITHUB_TOKEN" \
+              https://api.github.com/repos/$REPO/releases/$id
+            echo "Deleted draft release with ID: $id"
+          else
+            echo "No draft releases found"
+          fi

.github/workflows/build_snapshot.yml

@@ -0,0 +1,39 @@
+# This workflow will run release using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Snapshot Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-snapshot' # run only on version tags like v1.0.0-snapshot
+      # - 'v*'  # Run only on version tags like v1.0.0
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: sportsmanager2-stage
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run build script
+        run: npm run release
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          prerelease: true
+          name: "Snapshot ${{ github.ref_name }}"
+          files: package/packages/com_sportsmanager.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dtfbprod.yml

@@ -0,0 +1,23 @@
+name: Deploy production branch to dtfb.de
+on:
+  push:
+    branches: ['production']
+    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_PROD_PATH }}
+        remote_host: ${{ secrets.DTFB_PROD_HOST }}
+        remote_port: ${{ secrets.DTFB_PROD_PORT }}
+        remote_user: ${{ secrets.DTFB_PROD_USER }}
+        remote_key: ${{ secrets.DTFB_PROD_KEY }}
+        

.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 }}
+        

.github/workflows/kickernprod.yml

@@ -0,0 +1,23 @@
+name: Deploy production branch to kickern-hamburg.de
+on:
+  push:
+    branches: ['production']
+    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_PROD_PATH }}
+        remote_host: ${{ secrets.KICKERN_PROD_HOST }}
+        remote_port: ${{ secrets.KICKERN_PROD_PORT }}
+        remote_user: ${{ secrets.KICKERN_PROD_USER }}
+        remote_key: ${{ secrets.KICKERN_PROD_KEY }}
+        

.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 }}
+        

.gitignore

@@ -1,6 +1,6 @@
 ### WebStorm/IntelliJ ###
 /.idea
-
+.DS_Store
 # Dependency directories
 /node_modules
 

README.md

@@ -1,33 +1,107 @@
 # SportsManager
 
-## Deploy status
+## DEV/STAGE environments
 
-### DEV environment
+| LV     | HOSTER   | DOMAIN                                                       | BRANCH               |
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/173/badge.svg?token=8baa7fbc7039a8f3bb2b0cf06a1365e3ad1e9b20e48db86168c0bbf82611173d "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/173) [Preview: sportsmanager.s10.kicktemp.dev](https://sportsmanager.s10.kicktemp.dev)
+| ------ | -------- | ------------------------------------------------------------ | -------------------- |
+| DTFB   | Kicktemp | [stage.dtfb.de](https://stage.dtfb.de)                       | dev                  |
+| TFVHH  | Kicktemp | [stage.kickern-hamburg.de](https://stage.kickern-hamburg.de) | dev                  |
+| STFVH  | DTFB     | [stage.stfv.de](https://stage.stfv.de/)                      | sportsmanager2-stage |
+| MTFV   | DTFB     | [stage.mtfv.de](https://stage.mtfv.de/)                      | ?                    |
+| TFVSH  | DTFB     | [relaunch.tfvsh.de](https://relaunch.tfvsh.de)               | ?                    |
 
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/204/badge.svg?token=8baa7fbc7039a8f3bb2b0cf06a1365e3ad1e9b20e48db86168c0bbf82611173d "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/204) [Preview: stage.kickern-hamburg.de](https://stage.kickern-hamburg.de)
 
-### PROD environment
+## PROD environments
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/145/badge.svg?token=8baa7fbc7039a8f3bb2b0cf06a1365e3ad1e9b20e48db86168c0bbf82611173d "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/145) [Preview: dtfb.de](https://dtfb.de)
 
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/174/badge.svg?token=8baa7fbc7039a8f3bb2b0cf06a1365e3ad1e9b20e48db86168c0bbf82611173d "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/174) [Preview: kickern-hamburg.de](https://kickern-hamburg.de)
+| LV     | HOSTER   | DOMAIN                                           | BRANCH              |
+| ------ | -------- | ------------------------------------------------ | ------------------- |
+| DTFB   | Kicktemp | [dtfb.de](https://dtfb.de)                       | production          |
+| TFVHH  | Kicktemp | [kickern-hamburg.de](https://kickern-hamburg.de) | production          |
+| MTFV   | DTFB     | [mtfv.de](https://mtfv.de/)                      | sportsmanager2-prod |
+| TFVSH  | DTFB     | [tfvsh.de](https://tfvsh.de/)                    | sportsmanager2-prod |
+| STFVH  | DTFB     | [stfv.de](https://stfv.de/)                      | sportsmanager2-prod |
 
-## Lokale Entwicklungsumgebung
-### Benötigte Programme
 
-[get docker](https://docs.docker.com/get-docker/)
+## Test setup
-[get node](https://nodejs.org/en/download/) for packaging
+### Installation
-### Vorbereitung der Entwicklungsumgebung durch Akeeba Backup Restore
+To start joomla and the database, run
 
-- `docker compose up -d` ausführen und warten bis joomla auf [localhost:8080](localhost:8080) erreichbar ist
+```shell
-- im Verzeichnis [data/joomla_data/](data/joomla_data/) folgende Daten ablegen:
+   docker-compose up -d
-  - die [kickstarter datei](https://www.akeeba.com/download/akeeba-kickstart/7-1-2/kickstart-core-7-1-2-zip.raw) von akeeba
+```
-  - das backup von der dtfb seite (herunterladen via ftp auf u231953.your-storagebox.de)
-  - [Vollständige Anleitung](https://www.siteground.com/kb/how_to_extract_and_restore_a_joomla_jpa_archive_or_backup/)
-- [localhost:8080/kickstart.php](localhost:8080/kickstart.php) aufrufen
 
-### Komponenten verpacken
+### Release creation
+To create a release execute 
+```shell
+    npm run release
+```
 
-- Abhängigkeiten installieren via `npm i`.
+### Deployment
-- Paketierung beginnen mit `npm run package`
+Deployment can only be done manually right now (sad)  
-- Joomla Komponente ist nun hier fertig verpackt: [package/packages/com_sportsmanager.zip](package/packages/com_sportsmanager.zip)
+To do this go to
+[Testserver Extension Installer Site](http://localhost:8080/administrator/index.php?option=com_installer&view=install)
+and upload the zip file found in `./package/packages`
+
+
+### Development Tools
+If you are using Intellij, there is a plugin named Joomla! which helps with resolving
+joomla specific database prefixes like #__  
+To set it up, insert into the configuration popup which follows after you enable the framework support:  
+Joomla install path: `./data/joomla_data`  
+JConfig: `./data/joomla_data/configuration.php`
+> This works only with mounted volumes. However, mounted volumes will slow down the joomla instance significantly.  
+> The current setup does not use mounted volumes.
+> An alternative would be to download joomla and use that installation
+ 
+### Debugging (with Docker/Intellij)
+1. Start Docker Container (see above)
+2. Create a terminal for that container
+    ```shell 
+      docker exec -it <container_name> bash
+    ```
+3. install xdebug within the container since joomla does not come with xdebug preinstalled  
+    ```shell 
+      pecl install xdebug
+    ```
+4. restart the container
+5. In Intellij Go to [File | Settings | Languages & Frameworks | PHP | Servers](jetbrains://idea/settings?name=Languages+%26+Frameworks--PHP--Servers) and setup your server
+
+    |          |           |
+    |----------|-----------|
+    | name     | anything  |
+    | host     | localhost |
+    | port     | 8080      |
+    | debugger | xdebug    |
+    
+    use the path mapping and map the repo structure to the container content
+
+    | File/Directory                                                   | path on server                         |
+    |------------------------------------------------------------------|----------------------------------------|
+    | \<path>/com_sportsmanager/src/structure/administrator/components | /var/www/html/administrator/components |
+    | \<path>/com_sportsmanager/src/structure/components               | /var/www/html/components               |
+   
+7. Click on "Start Listening for PHP Debug Connections" in the top row of intellij
+8. (Not sure if optional) Install a browser extension by Jetbrains  
+https://chromewebstore.google.com/detail/xdebug-helper-by-jetbrain/aoelhdemabeimdhedkidlnbkfhnhgnhm
+
+
+### How to release
+Hint: for technical details regarding the release process have a look into .github/...  
+To create a release these steps need to be followed
+1. make sure all needed code changes are merged from dev -> stage -> prod, since releases may only be build on prod branch
+2. give pull requests meaningful names and label them enhancement/bug/chore since labels and names are used for release note generation
+    Hint: if a specific pull request should be ignored, add the label changelog-ignore
+3. tag a commit (recommended is the latest merge on prod). The pipeline is listening for any tag fitting `v[0-9]+.[0-9]+.[0-9]+`
+    ```shell
+      git tag -a v1.2.3 1a2b3c4 -m "Release version 1.2.3"
+    ```
+4. push the tag 
+    ```shell
+      git push origin --tags
+    ```
+5. the tag push will trigger the pipeline, and it will create the release and store in GitHub
+
+A release can be created again anytime by deleting the release from GitHub, deleting the tag (from GitHub and additionally from git)
+and repeating step 3 and 4
+
+Further: merges from dev to stage and from stage to prod can only be done by creating pull requests. These pull requests will be automatically labeled as changelog-ignore

RELEASE_NOTES.md

@@ -0,0 +1,2 @@
+This is no official release!  
+The Release and the release notes will be generated by github actions

docker-compose.yml

@@ -1,31 +1,43 @@
-version: '2'
 services:
-  mariadb:
+  joomla:
-    image: docker.io/bitnami/mariadb:10.3
+    image: joomla:5.2.4
+    restart: always
+    ports:
+      - '8080:80'
+    environment:
+      JOOMLA_DB_HOST: db
+      JOOMLA_DB_USER: joomla
+      JOOMLA_DB_PASSWORD: examplepass
+      JOOMLA_DB_NAME: joomla_db
+      JOOMLA_SITE_NAME: Sportsmanager Testserver
+      JOOMLA_ADMIN_USER: Joomla Hero
+      JOOMLA_ADMIN_USERNAME: joomla
+      JOOMLA_ADMIN_PASSWORD: joomla@secured
+      JOOMLA_ADMIN_EMAIL: joomla@example.com
+    volumes:
+      - joomla_data:/var/www/html
+      - './docker/php.ini:/usr/local/etc/php/php.ini'
+    networks:
+      - joomla_network
+
+  db:
+    image: mysql:8.0
+    restart: always
     ports:
       - '3306:3306'
     environment:
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
+      MYSQL_DATABASE: joomla_db
-      - ALLOW_EMPTY_PASSWORD=yes
+      MYSQL_USER: joomla
-      - MARIADB_USER=bn_joomla
+      MYSQL_PASSWORD: examplepass
-      - MARIADB_DATABASE=bitnami_joomla
+      MYSQL_RANDOM_ROOT_PASSWORD: '1'
-      - MARIADB_INITDB_SKIP_TZINFO=yes
+      TZ: Europe/Berlin
     volumes:
-      - './data/mariadb_data:/bitnami/mariadb'
+      - joomla_database:/var/lib/mysql
-  joomla:
+    networks:
-    build: docker/joomla
+      - joomla_network
-    ports:
+
-      - '8080:8080'
+networks:
-      - '8443:8443'
+  joomla_network:
-    environment:
+volumes:
-      - JOOMLA_DATABASE_HOST=mariadb
+  joomla_data:
-      - JOOMLA_DATABASE_PORT_NUMBER=3306
+  joomla_database:
-      - JOOMLA_DATABASE_USER=bn_joomla
-      - JOOMLA_DATABASE_NAME=bitnami_joomla
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
-      - ALLOW_EMPTY_PASSWORD=yes
-    volumes:
-      - './data/joomla_data:/bitnami/joomla'
-      - './docker/php.ini:/opt/bitnami/php/etc/php.ini:ro'
-    depends_on:
-      - mariadb

docker/joomla/Dockerfile

@@ -1,4 +0,0 @@
-FROM docker.io/bitnami/joomla:3
-
-# Some credit goes to: https://www.linode.com/community/questions/16977/server-fails-after-installing-certbot-mpm-run-failed-exiting#answer-66578
-RUN echo 'Mutex posixsem' >>/opt/bitnami/apache2/conf/httpd.conf

docker/php.ini

@@ -9,15 +9,15 @@
 ; PHP attempts to find and load this configuration from a number of locations.
 ; The following is a summary of its search order:
 ; 1. SAPI module specific location.
-; 2. The PHPRC environment variable. (As of PHP 5.2.0)
+; 2. The PHPRC environment variable.
-; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
+; 3. A number of predefined registry keys on Windows
 ; 4. Current working directory (except CLI)
 ; 5. The web server's directory (for SAPI modules), or directory of PHP
 ; (otherwise in Windows)
 ; 6. The directory from the --with-config-file-path compile time option, or the
 ; Windows directory (usually C:\windows)
 ; See the PHP docs for more specific information.
-; http://php.net/configuration.file
+; https://php.net/configuration.file
 
 ; The syntax of the file is extremely simple.  Whitespace and lines
 ; beginning with a semicolon are silently ignored (as you probably guessed).
@@ -31,7 +31,7 @@
 ; special sections cannot be overridden by user-defined INI files or
 ; at runtime. Currently, [PATH=] and [HOST=] sections only work under
 ; CGI/FastCGI.
-; http://php.net/ini.sections
+; https://php.net/ini.sections
 
 ; Directives are specified using the following syntax:
 ; directive = value
@@ -75,7 +75,7 @@
 
 ; php.ini-production contains settings which hold security, performance and
 ; best practices at its core. But please be aware, these settings may break
-; compatibility with older or less security conscience applications. We
+; compatibility with older or less security-conscious applications. We
 ; recommending using the production ini in production and testing environments.
 
 ; php.ini-development is very similar to its production variant, except it is
@@ -479,7 +479,7 @@ error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-errors
-display_errors = On
+display_errors = Off
 
 ; The display of errors which occur during PHP's startup sequence are handled
 ; separately from display_errors. PHP's default behavior is to suppress those
@@ -756,7 +756,7 @@ user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
 ; http://php.net/extension-dir
-extension_dir = /opt/bitnami/php/lib/php/extensions
+;extension_dir = /usr/local/lib/php/extensions
 ; On windows:
 ;extension_dir = "ext"
 
@@ -839,7 +839,7 @@ file_uploads = On
 ; Temporary directory for HTTP uploaded files (will use system default if not
 ; specified).
 ; http://php.net/upload-tmp-dir
-upload_tmp_dir = /opt/bitnami/php/tmp
+upload_tmp_dir = /tmp
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
@@ -1318,7 +1318,7 @@ session.save_handler = files
 ;
 ; The path can be defined as:
 ;
-session.save_path = /opt/bitnami/php/var/run/session
+session.save_path = /tmp/session
 ;
 ; where N is an integer.  Instead of storing all the session files in
 ; /path, what this will do is use subdirectories N-levels deep, and
@@ -1334,12 +1334,10 @@ session.save_path = /opt/bitnami/php/var/run/session
 ; The file storage module creates files using mode 600 by default.
 ; You can change that by using
 ;
-session.save_path = /opt/bitnami/php/var/run/session
 ;
 ; where MODE is the octal representation of the mode. Note that this
 ; does not overwrite the process's umask.
 ; http://php.net/session.save-path
-session.save_path = /opt/bitnami/php/var/run/session
 
 ; Whether to use strict session mode.
 ; Strict session mode does not accept an uninitialized session ID, and
@@ -1539,18 +1537,18 @@ session.sid_bits_per_character = 5
 ; Default Value: "1%"
 ; Development Value: "1%"
 ; Production Value: "1%"
-; http://php.net/session.upload-progress.freq
+; https://php.net/session.upload-progress.freq
 ;session.upload_progress.freq =  "1%"
 
 ; The minimum delay between updates, in seconds
 ; Default Value: 1
 ; Development Value: 1
 ; Production Value: 1
-; http://php.net/session.upload-progress.min-freq
+; https://php.net/session.upload-progress.min-freq
 ;session.upload_progress.min_freq = "1"
 
 ; Only write session data when session data is changed. Enabled by default.
-; http://php.net/session.lazy-write
+; https://php.net/session.lazy-write
 ;session.lazy_write = On
 
 [Assertion]
@@ -1558,67 +1556,47 @@ session.sid_bits_per_character = 5
 ; -1: Do not compile at all
 ;  0: Jump over assertion at run-time
 ;  1: Execute assertions
-; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1)
+; Changing from or to a negative value is only possible in php.ini!
+; (For turning assertions on and off at run-time, toggle zend.assertions between the values 1 and 0)
 ; Default Value: 1
 ; Development Value: 1
 ; Production Value: -1
-; http://php.net/zend.assertions
+; https://php.net/zend.assertions
 zend.assertions = -1
 
-; Assert(expr); active by default.
-; http://php.net/assert.active
-;assert.active = On
-
-; Throw an AssertionError on failed assertions
-; http://php.net/assert.exception
-;assert.exception = On
-
-; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active)
-; http://php.net/assert.warning
-;assert.warning = On
-
-; Don't bail out by default.
-; http://php.net/assert.bail
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-; http://php.net/assert.callback
-;assert.callback = 0
-
-; Eval the expression with current error_reporting().  Set to true if you want
-; error_reporting(0) around the eval().
-; http://php.net/assert.quiet-eval
-;assert.quiet_eval = 0
-
 [COM]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-; http://php.net/com.typelib-file
+; https://php.net/com.typelib-file
 ;com.typelib_file =
 
 ; allow Distributed-COM calls
-; http://php.net/com.allow-dcom
+; https://php.net/com.allow-dcom
 ;com.allow_dcom = true
 
-; autoregister constants of a component's typlib on com_load()
+; autoregister constants of a component's typelib on com_load()
-; http://php.net/com.autoregister-typelib
+; https://php.net/com.autoregister-typelib
 ;com.autoregister_typelib = true
 
 ; register constants casesensitive
-; http://php.net/com.autoregister-casesensitive
+; https://php.net/com.autoregister-casesensitive
 ;com.autoregister_casesensitive = false
 
 ; show warnings on duplicate constant registrations
-; http://php.net/com.autoregister-verbose
+; https://php.net/com.autoregister-verbose
 ;com.autoregister_verbose = true
 
 ; The default character set code-page to use when passing strings to and from COM objects.
 ; Default: system ANSI code page
 ;com.code_page=
 
+; The version of the .NET framework to use. The value of the setting are the first three parts
+; of the framework's version number, separated by dots, and prefixed with "v", e.g. "v4.0.30319".
+;com.dotnet_version=
+
 [mbstring]
 ; language for internal character representation.
 ; This affects mb_send_mail() and mbstring.detect_order.
-; http://php.net/mbstring.language
+; https://php.net/mbstring.language
 ;mbstring.language = Japanese
 
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
@@ -1633,7 +1611,7 @@ zend.assertions = -1
 ; mbstring.encoding_translation = On is needed to use this setting.
 ; If empty, default_charset or input_encoding or mbstring.input is used.
 ; The precedence is: default_charset < input_encoding < mbstring.http_input
-; http://php.net/mbstring.http-input
+; https://php.net/mbstring.http-input
 ;mbstring.http_input =
 
 ; Use of this INI entry is deprecated, use global output_encoding instead.
@@ -1643,7 +1621,7 @@ zend.assertions = -1
 ; The precedence is: default_charset < output_encoding < mbstring.http_output
 ; To use an output encoding conversion, mbstring's output handler must be set
 ; otherwise output encoding conversion cannot be performed.
-; http://php.net/mbstring.http-output
+; https://php.net/mbstring.http-output
 ;mbstring.http_output =
 
 ; enable automatic encoding translation according to
@@ -1651,54 +1629,40 @@ zend.assertions = -1
 ; converted to internal encoding by setting this to On.
 ; Note: Do _not_ use automatic encoding translation for
 ;       portable libs/applications.
-; http://php.net/mbstring.encoding-translation
+; https://php.net/mbstring.encoding-translation
 ;mbstring.encoding_translation = Off
 
 ; automatic encoding detection order.
 ; "auto" detect order is changed according to mbstring.language
-; http://php.net/mbstring.detect-order
+; https://php.net/mbstring.detect-order
 ;mbstring.detect_order = auto
 
 ; substitute_character used when character cannot be converted
 ; one from another
-; http://php.net/mbstring.substitute-character
+; https://php.net/mbstring.substitute-character
 ;mbstring.substitute_character = none
 
-; overload(replace) single byte functions by mbstring functions.
+; Enable strict encoding detection.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
+;mbstring.strict_detection = Off
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-; http://php.net/mbstring.func-overload
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-; Default: Off
-;mbstring.strict_detection = On
 
 ; This directive specifies the regex pattern of content types for which mb_output_handler()
 ; is activated.
-; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
+; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml)
-;mbstring.http_output_conv_mimetype=
+;mbstring.http_output_conv_mimetypes=
 
 ; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
 ; to the pcre.recursion_limit for PCRE.
-; Default: 100000
 ;mbstring.regex_stack_limit=100000
 
 ; This directive specifies maximum retry count for mbstring regular expressions. It is similar
 ; to the pcre.backtrack_limit for PCRE.
-; Default: 1000000
 ;mbstring.regex_retry_limit=1000000
 
 [gd]
 ; Tell the jpeg decode to ignore warnings and try to create
 ; a gd image. The warning will then be displayed as notices
 ; disabled by default
-; http://php.net/gd.jpeg-ignore-warning
+; https://php.net/gd.jpeg-ignore-warning
 ;gd.jpeg_ignore_warning = 1
 
 [exif]
@@ -1706,48 +1670,48 @@ zend.assertions = -1
 ; With mbstring support this will automatically be converted into the encoding
 ; given by corresponding encode setting. When empty mbstring.internal_encoding
 ; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
+; intel byte order. A decode setting must not be empty.
-; http://php.net/exif.encode-unicode
+; https://php.net/exif.encode-unicode
 ;exif.encode_unicode = ISO-8859-15
 
-; http://php.net/exif.decode-unicode-motorola
+; https://php.net/exif.decode-unicode-motorola
 ;exif.decode_unicode_motorola = UCS-2BE
 
-; http://php.net/exif.decode-unicode-intel
+; https://php.net/exif.decode-unicode-intel
 ;exif.decode_unicode_intel    = UCS-2LE
 
-; http://php.net/exif.encode-jis
+; https://php.net/exif.encode-jis
 ;exif.encode_jis =
 
-; http://php.net/exif.decode-jis-motorola
+; https://php.net/exif.decode-jis-motorola
 ;exif.decode_jis_motorola = JIS
 
-; http://php.net/exif.decode-jis-intel
+; https://php.net/exif.decode-jis-intel
 ;exif.decode_jis_intel    = JIS
 
 [Tidy]
 ; The path to a default tidy configuration file to use when using tidy
-; http://php.net/tidy.default-config
+; https://php.net/tidy.default-config
 ;tidy.default_config = /usr/local/lib/php/default.tcfg
 
 ; Should tidy clean and repair output automatically?
 ; WARNING: Do not use this option if you are generating non-html content
 ; such as dynamic images
-; http://php.net/tidy.clean-output
+; https://php.net/tidy.clean-output
 tidy.clean_output = Off
 
 [soap]
 ; Enables or disables WSDL caching feature.
-; http://php.net/soap.wsdl-cache-enabled
+; https://php.net/soap.wsdl-cache-enabled
 soap.wsdl_cache_enabled=1
 
 ; Sets the directory name where SOAP extension will put cache files.
-; http://php.net/soap.wsdl-cache-dir
+; https://php.net/soap.wsdl-cache-dir
 soap.wsdl_cache_dir="/tmp"
 
 ; (time to live) Sets the number of second while cached file will be used
 ; instead of original one.
-; http://php.net/soap.wsdl-cache-ttl
+; https://php.net/soap.wsdl-cache-ttl
 soap.wsdl_cache_ttl=86400
 
 ; Sets the size of the cache limit. (Max. number of WSDL files to cache)
@@ -1806,6 +1770,11 @@ opcache.revalidate_freq = 60
 ; size of the optimized code.
 ;opcache.save_comments=1
 
+; If enabled, compilation warnings (including notices and deprecations) will
+; be recorded and replayed each time a file is included. Otherwise, compilation
+; warnings will only be emitted when the file is first cached.
+;opcache.record_warnings=0
+
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0
 
@@ -1827,10 +1796,6 @@ opcache.revalidate_freq = 60
 ; are cached.
 ;opcache.max_file_size=0
 
-; Check the cache checksum each N requests.
-; The default value of "0" means that the checks are disabled.
-;opcache.consistency_checks=0
-
 ; How long to wait (in seconds) for a scheduled restart to begin if the cache
 ; is not being accessed.
 ;opcache.force_restart_timeout=180
@@ -1868,7 +1833,16 @@ opcache.revalidate_freq = 60
 ; Enables and sets the second level cache directory.
 ; It should improve performance when SHM memory is full, at server restart or
 ; SHM reset. The default "" disables file based caching.
-opcache.file_cache = /opt/bitnami/php/var/run/opcache_file
+opcache.file_cache = /tmp/opcache_file
+
+; Enables or disables read-only mode for the second level cache directory.
+; It should improve performance for read-only containers,
+; when the cache is pre-warmed and packaged alongside the application.
+; Best used with `opcache.validate_timestamps=0`, `opcache.enable_file_override=1`
+; and `opcache.file_cache_consistency_checks=0`.
+; Note: A cache generated with a different build of PHP, a different file path,
+; or different settings (including which extensions are loaded), may be ignored.
+;opcache.file_cache_read_only=0
 
 ; Enables or disables opcode caching in shared memory.
 ;opcache.file_cache_only=0
@@ -1882,8 +1856,13 @@ opcache.file_cache = /opt/bitnami/php/var/run/opcache_file
 ;opcache.file_cache_fallback=1
 
 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
+; Under certain circumstances (if only a single global PHP process is
-;opcache.huge_code_pages=1
+; started from which all others fork), this can increase performance
+; by a tiny amount because TLB misses are reduced.  On the other hand, this
+; delays PHP startup, increases memory usage and degrades performance
+; under memory pressure - use with care.
+; Requires appropriate OS configuration.
+;opcache.huge_code_pages=0
 
 ; Validate cached file permissions.
 ;opcache.validate_permission=0
@@ -1897,12 +1876,12 @@ opcache.file_cache = /opt/bitnami/php/var/run/opcache_file
 
 ; Specifies a PHP script that is going to be compiled and executed at server
 ; start-up.
-; http://php.net/opcache.preload
+; https://php.net/opcache.preload
 ;opcache.preload=
 
 ; Preloading code as root is not allowed for security reasons. This directive
 ; facilitates to let the preloading to be run as another user.
-; http://php.net/opcache.preload_user
+; https://php.net/opcache.preload_user
 ;opcache.preload_user=
 
 ; Prevents caching files that are less than this number of seconds old. It
@@ -1945,44 +1924,12 @@ opcache.file_cache = /opt/bitnami/php/var/run/opcache_file
 
 ; List of headers files to preload, wildcard patterns allowed.
 ;ffi.preload=
-zend_extension = opcache
-opcache.fast_shutdown = 1
-;extension = pdo_dblib
-;extension = apcu
-;extension = mcrypt
-;extension = imagick
-;extension = memcached
-;extension = maxminddb
-;extension = mongodb
 
-;[XDebug]
+zend_extension=xdebug.so
-zend_extension = xdebug
-xdebug.mode = debug
-;xdebug.client_host = 127.0.0.1
-;xdebug.client_port = 9000
-;xdebug.output_dir = /tmp
-;xdebug.remote_handler = dbgp
-
-;xdebug.remote_port=9000
-;xdebug.remote_host=10.254.254.254
-;xdebug.remote_autostart=1
-;xdebug.remote_enable=1
-;xdebug.default_enable=0
-;xdebug.remote_host=host.docker.internal
-;xdebug.remote_port=9000
-;xdebug.remote_connect_back=0
-;xdebug.profiler_enable=0
-;xdebug.remote_log="/tmp/xdebug.log"
 xdebug.mode=debug
-xdebug.client_port=9000
-xdebug.client_host=host.docker.internal
-xdebug.remote_handler=dbgp
-;xdebug.remote_host=host.docker.internal
-;xdebug.remote_port=9000
 xdebug.start_with_request=yes
-xdebug.discover_client_host=0
+xdebug.client_host=host.docker.internal
-xdebug.idekey=PHPSTORM
+xdebug.client_port=9003
-xdebug.show_error_trace = 1
+xdebug.log=/tmp/xdebug.log
-xdebug.max_nesting_level=250
+xdebug.discover_client_host=false
-xdebug.var_display_max_depth=10
+xdebug.log_level=7
-;xdebug.log=/tmp/xdebug.log

gulpfile.babel.js/config.js

@@ -43,7 +43,7 @@ export const config = {
       watch: ['src/structure/**/*.{php,html,xml,ini,less,json,js,css}'],
     },
     copyrelease: {
-      src: ['src/structure/**/**', 'src/structure/**/.*', '!src/structure/**/*.{php,html,xml,ini,less,json,js,css}', '!src/structure/**/.*.{php,html,xml,ini,less,json,js,css}'],
+      src: ['RELEASE_NOTES.md','src/structure/**/**', 'src/structure/**/.*', '!src/structure/**/*.{php,html,xml,ini,less,json,js,css}', '!src/structure/**/.*.{php,html,xml,ini,less,json,js,css}'],
       replacesrc: ['src/structure/**/**.{php,html,xml,ini,less,json,js,css}', 'src/structure/**/.*.{php,html,xml,ini,less,json,js,css}'],
       dest: 'releasefiles/'
     },
@@ -59,16 +59,28 @@ export const config = {
       src: './releasefiles/components/com_sportsmanager/**/**',
       dest: 'sourcefiles/com_sportsmanager/site'
     },
+    {
+      src: './releasefiles/language/**/**',
+      dest: 'sourcefiles/com_sportsmanager/site/language'
+    },
     {
       src: './releasefiles/administrator/components/com_sportsmanager/**/**',
       dest: 'sourcefiles/com_sportsmanager/admin'
     },
     {
-      src: './releasefiles/administrator/components/com_sportsmanager/sportsmanager.xml',
+      src: './releasefiles/administrator/language/**/**',
+      dest: 'sourcefiles/com_sportsmanager/admin/language'
+    },
+    {
+      src: './releasefiles/administrator/services/**/**',
+      dest: 'sourcefiles/com_sportsmanager/admin/services'
+    },
+    {
+      src: './releasefiles/sportsmanager.xml',
       dest: 'sourcefiles/com_sportsmanager/'
     },
     {
-      src: './releasefiles/administrator/components/com_sportsmanager/script.php',
+      src: './releasefiles/script.php',
       dest: 'sourcefiles/com_sportsmanager/'
     },
     {
@@ -78,6 +90,10 @@ export const config = {
     {
       src: './releasefiles/plugins/system/kickyootheme/**/**',
       dest: 'sourcefiles/plg_system_kickyootheme'
+    },
+    {
+      src: './releasefiles/RELEASE_NOTES.md',
+      dest: 'sourcefiles/com_sportsmanager/admin/'
     }
   ],
   package: [

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sportsmanager",
   "description": "",
-  "version": "0.0.1",
+  "version": "2.0.0",
   "scripts": {
     "boilerplate": "cross-env NODE_ENV=development gulp boilerplate",
     "build": "cross-env NODE_ENV=production gulp build",
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/nielsnuebel/com_sportsmanager.git"
+    "url": "https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git"
   },
   "keywords": [],
   "author": {
@@ -51,9 +51,9 @@
     "[PLUGINTYPE]": "system"
   },
   "casesensitive": {
-    "joomlaboilerplate": "sportsmanager",
+    "joomlaboilerplate": "kickboilerplate",
-    "JoomlaBoilerplate": "SportsManager",
+    "JoomlaBoilerplate": "KickBoilerPlate",
-    "JOOMLABOILERPLATE": "SPORTSMANAGER"
+    "JOOMLABOILERPLATE": "KICKBOILERPLATE"
   },
   "boilerplate": {
     "files": [
@@ -68,7 +68,7 @@
           "./boilerplates/plugin/system/**/**.{php,html,xml,ini,less,json,js,css}",
           "./boilerplates/plugin/system/**/.*.{php,html,xml,ini,less,json,js,css}"
         ],
-        "dest": "src/structure/plugins/system/sportsmanager"
+        "dest": "src/structure/plugins/system/kickboilerplate"
       },
       {
         "src": [
@@ -122,7 +122,6 @@
     "browser-sync": "^2.26.12",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.2",
-    "fs": "0.0.1-security",
     "gulp": "^4.0.2",
     "gulp-changed": "^4.0.2",
     "gulp-clean": "^0.4.0",

src/database/updates.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__sportsmanager_rangliste`  ADD COLUMN `lizenzen` varchar(50) NULL DEFAULT '';

src/structure/administrator/components/com_sportsmanager/admin.sportsmanager.php

@@ -1,23 +0,0 @@
-<?php
-// no direct access
-defined('_JEXEC') or die('Restricted access');
-
-// Require the base controller
-require_once (JPATH_COMPONENT.DS.'controller.php');
-
-// Require specific controller if requested
-//if($controller = JRequest::getVar('controller')) {
-//	require_once (JPATH_COMPONENT.DS.'controllers'.DS.$controller.'.php');
-//}
-
-// Create the controller
-//$classname	= 'AutosController'.$controller;
-//$controller = new $classname( );
-
-// Perform the Request task
-//$controller->execute( JRequest::getVar('task'));
-
-// Redirect if set by the controller
-//$controller->redirect();
-
-?>

src/structure/administrator/components/com_sportsmanager/controller.php

@@ -1,31 +0,0 @@
-<?php
-/*
- * Sports Manager (C) 2006-2020, Sven Nickel
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
- 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
- 
-/**
- * General Controller of SportsManager component
- */
-class SportsManagerController extends JControllerLegacy
-{
-        /**
-         * display task
-         *
-         * @return void
-         */
-        function display($cachable = false, $urlparams = false) 
-        {
-                // set default view if not set
-                $input = JFactory::getApplication()->input;
-                $input->set('view', $input->getCmd('view', 'SportsManager'));
- 
-                // call parent behavior
-                parent::display($cachable);
-        }
-}

src/structure/administrator/components/com_sportsmanager/services/provider.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package         Joomla.Administrator
+ * @subpackage      com_inlinecontact
+ *
+ * @copyright   (C) Alexander Niklaus. All rights reserved.
+ * @license         GNU General Public License version 2 or later
+ * @link            https://an-software.net
+ */
+
+defined('_JEXEC') or die;
+
+use Dtfb\Component\com_sportsmanager\Administrator\Extension\SportsmanagerComponent;
+use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactory;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The contact service provider.
+ *
+ * @since  1.0.0
+ */
+return new class implements ServiceProviderInterface {
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0.0
+	 */
+	public function register(Container $container): void
+    {
+        Log::addLogger(
+            [
+                'text_file' => 'com_sportsmanager.php',
+            ],
+            Log::ALL,
+            ['com_sportsmanager']
+        );
+
+		$container->registerServiceProvider(new MVCFactory('\\Dtfb\\Component\\com_sportsmanager'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Dtfb\\Component\\com_sportsmanager'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container) {
+				$component = new SportsmanagerComponent($container->get(ComponentDispatcherFactoryInterface::class));
+				$component->setMVCFactory($container->get(MVCFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};

src/structure/administrator/components/com_sportsmanager/sportsmanager.php

@@ -1,19 +0,0 @@
-<?php
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// import joomla controller library
-jimport('joomla.application.component.controller');
- 
-// Get an instance of the controller prefixed by HelloWorld
-$controller = JControllerLegacy::getInstance('SportsManager');
- 
-// Get the task
-$jinput = JFactory::getApplication()->input;
-$task = $jinput->get('task', "", 'STR' );
- 
-// Perform the Request task
-$controller->execute($task);
- 
-// Redirect if set by the controller
-$controller->redirect();

src/structure/administrator/components/com_sportsmanager/src/Controller/DisplayController.php

@@ -0,0 +1,19 @@
+<?php
+namespace Dtfb\Component\com_sportsmanager\Administrator\Controller;
+/*
+ * Sports Manager (C) 2006-2020, Sven Nickel
+ */
+
+// No direct access to this file
+use Joomla\CMS\MVC\Controller\BaseController;
+
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * General Controller of SportsManager component
+ * @since 1.0.0
+ */
+class DisplayController extends BaseController
+{
+    protected $default_view = 'sportsmanager';
+}

src/structure/administrator/components/com_sportsmanager/src/Extension/SportsmanagerComponent.php

@@ -0,0 +1,14 @@
+<?php
+namespace Dtfb\Component\com_sportsmanager\Administrator\Extension;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Extension\MVCComponent;
+use function defined;
+
+/**
+ * Component class for com_sportsmanager
+ *
+ * @since  2.0.0
+ */
+class SportsmanagerComponent extends MVCComponent {}

src/structure/administrator/components/com_sportsmanager/src/View/Sportsmanager/HtmlView.php

@@ -0,0 +1,40 @@
+<?php
+namespace Dtfb\Component\com_sportsmanager\Administrator\View\Sportsmanager;
+/*
+ * Sports Manager (C) 2006-2020, Sven Nickel
+ */
+
+// No direct access to this file
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * SportsManager View
+ * @since 1.0.0
+ */
+class HtmlView extends BaseHtmlView
+{
+    function display($tpl = null): void
+    {
+        ToolbarHelper::title(Text::_('COM_SPORTSMANAGER'));
+
+        ?>
+        <h3><?php echo Text::_('COM_SPORTSMANAGER'); ?> &#8211; Created by Sven Nickel | Maintained by DTFB</h3>
+        <?php
+
+        $notesPath = JPATH_COMPONENT_ADMINISTRATOR . '/RELEASE_NOTES.md';
+        if (file_exists($notesPath)) {
+            $notes = file_get_contents($notesPath);
+            echo '<div style="padding:1em;"><h3>Release Notes</h3><pre>' .
+                htmlspecialchars($notes) . '</pre></div>';
+        }
+
+
+        // Display the template
+        parent::display($tpl);
+    }
+}
+

src/structure/administrator/components/com_sportsmanager/views/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/administrator/components/com_sportsmanager/views/sportsmanager/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/administrator/components/com_sportsmanager/views/sportsmanager/index.html

@@ -1 +0,0 @@
-<html><body bgcolor="#FFFFFF"></body></html>

src/structure/administrator/components/com_sportsmanager/views/sportsmanager/tmpl/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/administrator/components/com_sportsmanager/views/sportsmanager/tmpl/index.html

@@ -1 +0,0 @@
-<html><body bgcolor="#FFFFFF"></body></html>

src/structure/administrator/components/com_sportsmanager/views/sportsmanager/view.html.php

@@ -1,49 +0,0 @@
-<?php
-/*
- * Sports Manager (C) 2006-2020, Sven Nickel
- */
- 
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
- 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
-/**
- * SportsManager View
- */
-
-class SportsManagerViewSportsManager extends JViewLegacy
-{
-        /**
-         * SportsManager view display method
-         * @return void
-         */
-        function display($tpl = null) 
-        {
-								JToolbarHelper::title(JText::_('COM_SPORTSMANAGER'));
-								
-								?>
-								<h2><?php echo JText::_('COM_SPORTSMANAGER'); ?> Copyright &copy; 2006 &#8211; 2014 Sven Nickel</h2>
-								<?php
-								/*
-                // Get data from the model
-                $items = $this->get('Items');
-                $pagination = $this->get('Pagination');
- 
-                // Check for errors.
-                if (count($errors = $this->get('Errors'))) 
-                {
-                        JError::raiseError(500, implode('<br />', $errors));
-                        return false;
-                }
-                // Assign data to the view
-                $this->items = $items;
-                $this->pagination = $pagination;
-								*/
-								
-                // Display the template
-                parent::display($tpl);
-        }
-}
-

src/structure/administrator/language/de-DE/de-DE.com_sportsmanager.sys.ini

@@ -21,12 +21,15 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TEAMS_JOINT="Mannschaften in gem
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CLUBS="Vereine"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_VENUES="Spielorte"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_APPOINTMENTS="Termine"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_MATCH_RESCHEDULING="Spielverlegungen"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_ASSOCIATION_BODIES="Verbandsorgane"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_HALL_OF_FAME="Hall Of Fame"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE="Titel"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE_DESC="Titel, der im Fenster oben angezeigt wird"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION="Beschreibung"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION_DESC="Beschreibung, die unterhalb des Titels angezeigt wird (WICHTIG: Werden HTML-Tags verwendet, müssen auch Umlaute in HTML-Code angeben werden)"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES="Kategorien"
-COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="Eine optionale Auswahl an durch Kommata getrennte Kategorienummern"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="Eine optionale Auswahl von Kategorienummern durch Kommata oder Spiegelstrich getrennt"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_TITLE="Layout: Elo-Rangliste"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_DESC="Auflistung der Spieler sortiert nach Elo-Wertung"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_OPTION_ELO_RANKING="Elo-Rangliste"

src/structure/administrator/language/en-GB/en-GB.com_sportsmanager.sys.ini

@@ -21,12 +21,15 @@ COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TEAMS_JOINT="Teams in joint list
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CLUBS="Clubs"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_VENUES="Venues"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_APPOINTMENTS="Appointments"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_MATCH_RESCHEDULING="Match reschedulings"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_ASSOCIATION_BODIES="Association bodies"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_HALL_OF_FAME="Hall of fame"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE="Title"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_TITLE_DESC="Title which will be shows on top"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION="Description"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_DESCRIPTION_DESC="Description that will be shows below the titel (IMPORTANT: if html tags are used, special characters must be maskeraded)"
 COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES="Categories"
-COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="An optional selection of category numbers seperated by commas"
+COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CATEGORIES_DESC="An optional selection of category numbers seperated by commas or bullet point"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_TITLE="Layout: elo ranking"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_DESC="Listing of players sorted by elo rating"
 COM_SPORTSMANAGER_LAYOUT_ELO_RANKING_OPTION_ELO_RANKING="Elo ranking"

src/structure/components/com_sportsmanager/api.php

@@ -2,35 +2,49 @@
 /*
  * Sports Manager API Extension
  */
-defined('_JEXEC') or die();
 
-$secret = JFactory::$config['secret'];
+use JetBrains\PhpStorm\NoReturn;
+use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Factory;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Registry\Registry;
 
-function abortWithError($error) {
+defined("_JEXEC") or die();
+
+require_once JPATH_SITE . '/components/com_sportsmanager/database/init.php';
+
+Factory::getContainer()->set(Registry::class, function () {
+    return new Registry();
+});
+
+$secret = Factory::getContainer()->get(Registry::class)->get("secret");
+
+#[NoReturn] function abortWithError($error): void
+{
     if (isJson()) {
-		header('content-type: application/json');
+        header("content-type: application/json");
-		die(json_encode(['error' => $error]));
+        die(json_encode(["error" => $error]));
     } else {
         die($error);
     }
 }
 
-function isJson() {
+function isJson(): bool
-  $jinput = JFactory::getApplication()->input;
+{
-
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
-  return $jinput->get('format') === 'json';
+    return $jInput->get('format') === 'json';
 }
 
-function notifyChange($data) {
+function notifyChange($data): void
+{
 
     try {
-	$db = &getDatabase();
+        $db = getDatabase();
         $query = "SELECT wert from #__sportsmanager_einstellungen WHERE name='api_push_key'";
-	$db->setQuery($query);
+        $push_key = loadResult($db, $query);
-	$push_key = $db->loadResult();
         $push_server = !empty($push_key) && isset(_payload($push_key)->aud) ? _payload($push_key)->aud : '';
         if ($push_server != '' && $push_key != '') {
-		$url = $push_server . (substr($push_server, -1) == '/' ? '' : '/') . 'v1/notifications/send';
+            $url = $push_server . (str_ends_with($push_server, '/') ? '' : '/') . 'v1/notifications/send';
             $key = 'key=' . $push_key;
 
             $ch = curl_init($url);
@@ -46,7 +60,7 @@ function notifyChange($data) {
                 CURLOPT_POSTFIELDS => json_encode($data),
             ));
             $resp = curl_exec($ch);
-        if ($resp == FALSE) {
+            if (!$resp) {
                 error_log("failed to send notification");
             }
         }
@@ -55,7 +69,8 @@ function notifyChange($data) {
     }
 }
 
-function begegnungChanged($begegnung, $begegnung_vorher, $modus, $heim_team, $gast_team, $spiele) {
+function begegnungChanged($begegnung, $begegnung_vorher, $modus, $heim_team, $gast_team, $spiele): void
+{
     notifyChange(['payload' => [
         'begegnung' => $begegnung,
         'begegnung_vorher' => $begegnung_vorher,
@@ -66,7 +81,8 @@ function begegnungChanged($begegnung, $begegnung_vorher, $modus, $heim_team, $ga
     ], 'type' => 'FIXTURE_RESULT_CHANGED']);
 }
 
-function begegnungTischChanged($begegnung, $heim_team, $gast_team) {
+function begegnungTischChanged($begegnung, $heim_team, $gast_team): void
+{
     notifyChange(['payload' => [
         'begegnung' => $begegnung,
         'heim_team' => $heim_team,
@@ -74,7 +90,8 @@ function begegnungTischChanged($begegnung, $heim_team, $gast_team) {
     ], 'type' => 'TABLE_CHANGED']);
 }
 
-function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $heim_team, $gast_team) {
+function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $heim_team, $gast_team): void
+{
     notifyChange([
         'payload' => [
             'begegnung' => $begegnung,
@@ -92,7 +109,8 @@ function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $h
  * @reponse body
  * { data: { token: "reqest_token", access_for_team: ["team_id_1", "team_id_2"]}, expires: 1520013747000}
  */
-function userToken() {
+#[NoReturn] function userToken(): void
+{
     global $secret;
     if (!isJson()) {
         abortWithError("JSON Request only");
@@ -100,33 +118,38 @@ function userToken() {
     if (isExternalDatabase()) {
         abortWithError("Local Database only");
     }
-	$jinput = JFactory::getApplication()->input->json;
+    $container = Factory::getContainer();
-	$access_key = $jinput->getString('access_key');
+    $jInput = $container->get(SiteApplication::class)->input->json;
+    $access_key = $jInput->getString('access_key');
 
     $user_id = _payload($access_key)->sub;
-	$user = JFactory::getUser($user_id);
+    $user = $container->get(UserFactoryInterface::class)->loadUserById($user_id);
 
-	if (!jwt_validate($access_key, $secret.$user->password)) {
+    if (!jwt_validate($access_key, $secret . $user->password)) {
         abortWithError('Access Key is invalid');
     }
 
+    try {
         $expires = new DateTime();
         $expires->modify('+16 hours');
-    $db = &getDatabase();
+        $db = getDatabase();
         $query = "SELECT berechtigt_team_id from #__sportsmanager_berechtigt_fuer_team where berechtigt_user_id = $user_id";
-    $db->setQuery($query);
+        $team_id = loadObjectList($db, $query);
-    if (!$db->execute()) {
+
-        abortWithError($db->stderr(true));
-    }
-    $team_id = $db->loadObjectList();
         JSON_sportsmanager::JSON([
             'token' => jwt_token([
                 'sub' => $user_id,
                 'exp' => $expires->getTimestamp(),
             ], $secret),
-		'access_for_teams' => array_map(function($item) { return $item->berechtigt_team_id; }, $team_id),
+            'access_for_teams' => array_map(function ($item) {
+                return $item->berechtigt_team_id;
+            }, $team_id),
             'expires' => $expires->getTimestamp() * 1000, //
         ]);
+    } catch (Exception $ex) {
+        error_log($ex);
+    }
+
 }
 
 /*
@@ -134,7 +157,8 @@ function userToken() {
  * @response body
  * { data: { token: "api_acccess_token" }}
  */
-function userAuth() {
+#[NoReturn] function userAuth(): void
+{
     global $secret;
     if (!isJson()) {
         die();
@@ -142,43 +166,47 @@ function userAuth() {
     if (isExternalDatabase()) {
         abortWithError("Local Database only");
     }
-	$jinput = JFactory::getApplication()->input->json;
+    $container = Factory::getContainer();
-	$username = $jinput->getString('username');
+    $jInput = $container->get(SiteApplication::class)->input->json;
-	$password = $jinput->getString('password');
+    $username = $jInput->getString('username');
+    $password = $jInput->getString('password');
 
-    $db = &getDatabase();
+    $db = getDatabase();
     $query = $db->getQuery(true);
-	$query->select('id')->from('#__users')->where('username = "' . $username . '"')->limit(1);
+    $query->select('id')->from('#__users')->where('username = "' . $username . '"')->setLimit(1);
-	$db->setQuery($query);
+    $user_id = loadResult($db, $query);
-	$user_id = $db->loadResult();
+    $user = $container->get(UserFactoryInterface::class)->loadUserById($user_id);
-	$user = JFactory::getUser($user_id);
 
-	if (JUserHelper::verifyPassword($password, $user->password, $user->id)) {
+    //TODO: pw verification modernising: use php native methods, however this also needs new pw hashing. maybe force a pw reset on all accounts
+    if (password_verify($password, $user->password)) {
 
         JSON_sportsmanager::JSON([
             'token' => jwt_token([
                 'sub' => $user_id,
                 'iat' => (new DateTime())->getTimestamp(),
-			], $secret.$user->password)
+            ], $secret . $user->password)
         ]);
-		return;
     }
     abortWithError('Wrong credentials');
 }
 
-function getUserID() {
+function getUserID(): int
+{
     global $secret;
-	$token = JFactory::getApplication()->input->server->getString('HTTP_SECRET', NULL);
+    $container = Factory::getContainer();
+    $input = $container->get(SiteApplication::class)->input;
+    $token = $input->server->getString('HTTP_SECRET', NULL);
 
     return $token != NULL && jwt_validate($token, $secret) && isset(_payload($token)->sub)
-        ? (int) _payload($token)->sub
+        ? (int)_payload($token)->sub
         : 0;
 }
 
-function getColorOfImage($image) {
+function getColorOfImage($image)
+{
     if ($image != NULL) {
 
-		if (strpos($image, '.png') !== false) {
+        if (str_contains($image, '.png')) {
             $img = imagecreatefrompng($image);
         } else {
             $img = imagecreatefromjpeg($image);
@@ -210,7 +238,8 @@ function getColorOfImage($image) {
     return NULL;
 }
 
-function colorKey($rgb) {
+function colorKey($rgb): string
+{
 
     $r = (int)($rgb['red'] / 100);
     $g = (int)($rgb['green'] / 100);
@@ -219,7 +248,8 @@ function colorKey($rgb) {
     return $r . '-' . $g . '-' . $b;
 }
 
-function hex($rgb) {
+function hex($rgb): ?string
+{
     $r = $rgb['red'];
     $g = $rgb['green'];
     $b = $rgb['blue'];
@@ -244,14 +274,16 @@ function hex($rgb) {
 /*
  * sign string with secret
  */
-function _sign($data, $secret, $algo = 'sha256') {
+function _sign($data, $secret): string
+{
     return base64_encode(hash_hmac('sha256', $data, $secret));
 }
 
 /*
  * get payload from jwt token
  */
-function _payload($token) {
+function _payload($token)
+{
     $jwt = explode('.', $token);
     return json_decode(base64_decode($jwt[0]));
 }
@@ -259,7 +291,8 @@ function _payload($token) {
 /*
  * headless signed jwt token
  */
-function jwt_token($payload, $secret) {
+function jwt_token($payload, $secret): string
+{
     $data = base64_encode(json_encode($payload));
 
     return $data . '.' . _sign($data, $secret);
@@ -268,7 +301,8 @@ function jwt_token($payload, $secret) {
 /*
  * validate token
  */
-function jwt_validate($token, $secret) {
+function jwt_validate($token, $secret): bool
+{
     $jwt = explode('.', $token);
     if (sizeof($jwt) == 2 && $jwt[1] == _sign($jwt[0], $secret)) {
         if (isset(_payload($token)->exp)) {

src/structure/components/com_sportsmanager/controller.php

@@ -1,24 +0,0 @@
-<?php
-/*
- * Sports Manager (C) 2006-2020, Sven Nickel
- */
-
-// Check to ensure this file is included in Joomla!
-defined('_JEXEC') or die();
-jimport('joomla.application.component.controller');
-
-/**
- * Auto Component Controller
- */
-class SportsManagerController extends JControllerLegacy
-{
-	public function display($cachable = false, $urlparams = false)
-	{
-		// Setzt einen Standard view
-		if ( ! JRequest::getCmd( 'view' ) ) {
-			JRequest::setVar('view', 'categories' );
-		}
-		return parent::display($cachable, $urlparams);
-	}
-}
-

src/structure/components/com_sportsmanager/database/init.php

@@ -0,0 +1,117 @@
+<?php
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Database\DatabaseInterface;
+use Joomla\Database\Mysql\MysqlDriver;
+use Joomla\Database\Mysqli\MysqliDriver;
+
+require_once JPATH_SITE . '/components/com_sportsmanager/database/util.php';
+
+function initDatabase(): void
+{
+    global $sportsmanager_database_local;
+    global $sportsmanager_database_external;
+    global $sportsmanager_joomla_path;
+    global $sportsmanager_joomla_url;
+
+    $sportsmanager_database_local = NULL;
+    $sportsmanager_database_external = NULL;
+    $sportsmanager_joomla_path = JPATH_ROOT;
+    $sportsmanager_joomla_url = Uri::base();
+
+    $sportsmanager_database_local = Factory::getContainer()->get(DatabaseInterface::class);
+
+    $query = "SELECT * FROM #__sportsmanager_einstellungen";
+    $rows = loadObjectList($sportsmanager_database_local, $query);
+
+    $database_driver = "mysql";
+    $database_host = "";
+    $database_user = "";
+    $database_password = "";
+    $database_database = "";
+    $database_prefix = "jos_";
+    $joomla_path = "";
+    $joomla_url = "";
+    foreach ($rows as $row) {
+        $name = mb_strtolower($row->name);
+        if ($name == "database_driver")
+            $database_driver = $row->wert;
+        else if ($name == "database_host")
+            $database_host = $row->wert;
+        else if ($name == "database_user")
+            $database_user = $row->wert;
+        else if ($name == "database_password")
+            $database_password = $row->wert;
+        else if ($name == "database_database")
+            $database_database = $row->wert;
+        else if ($name == "database_prefix")
+            $database_prefix = $row->wert;
+        else if ($name == "joomla_path")
+            $joomla_path = $row->wert;
+        else if ($name == "joomla_url")
+            $joomla_url = $row->wert;
+    }
+
+    if (!empty($database_driver) && !empty($database_host) && !empty($database_user) && !empty($database_database) && !empty($database_prefix) && !empty($joomla_path) && !empty($joomla_url)) {
+        $option = array(); //prevent problems
+
+        $option['driver'] = $database_driver;            // Database driver name
+        $option['host'] = $database_host;    // Database host name
+        $option['user'] = $database_user;       // User for database authentication
+        $option['password'] = $database_password;   // Password for database authentication
+        $option['database'] = $database_database;      // Database name
+        $option['prefix'] = $database_prefix;             // Database prefix (may be empty)
+
+        $sportsmanager_database_external = match ($option['driver']) {
+            'mysql' => new MysqlDriver($option),
+            'mysqli' => new MysqliDriver($option),
+            default => NULL,
+        };
+
+        if ($sportsmanager_database_external === NULL) {
+            echo "<strong>" . Text::_('COM_SPORTSMANAGER_CONNECTION_EXTERNAL_DB_FAILURE') . "</strong><br><br>";
+        } else {
+            try {
+                if (!$sportsmanager_database_external->execute()) {
+                    echo "<strong>" . Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_NO_SM_TABLES') . "</strong><br><br>";
+                    $sportsmanager_database_external = NULL;
+                } else {
+                    $query = "SELECT wert FROM #__sportsmanager_einstellungen WHERE name = 'datenbank_version'";
+                    $db_version = loadResult($sportsmanager_database_external, $query);
+                    if ($db_version < 38) {
+                        echo "<strong>" . Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_NO_SM_VERSION') . "</strong><br><br>";
+                        $sportsmanager_database_external = NULL;
+                    } else if (!is_dir($joomla_path . DIRECTORY_SEPARATOR . "images" . DIRECTORY_SEPARATOR . "sportsmanager")) {
+                        echo "<strong>" . Text::_('COM_SPORTSMANAGER_EXTERNAL_NO_IMAGES_FOLDER') . " '/images/sportsmanager'!</strong><br><br>";
+                        $sportsmanager_database_external = NULL;
+                    } else {
+                        $sportsmanager_joomla_path = $joomla_path;
+                        $sportsmanager_joomla_url = $joomla_url;
+                    }
+                }
+            } catch (Exception $e) {
+                error_log($e->getMessage());
+            }
+        }
+    }
+}
+
+function isExternalDatabase(): bool
+{
+    global $sportsmanager_database_external;
+    return $sportsmanager_database_external != NULL;
+}
+
+function getDatabase($forceLocalDB = FALSE)
+{
+    global $sportsmanager_database_local;
+    global $sportsmanager_database_external;
+    if ($forceLocalDB || $sportsmanager_database_external == NULL)
+        $db = $sportsmanager_database_local;
+    else
+        $db = $sportsmanager_database_external;
+
+    return $db;
+}

src/structure/components/com_sportsmanager/database/util.php

@@ -0,0 +1,47 @@
+<?php
+
+use Joomla\CMS\Log\Log;
+
+/**
+ * @param $db
+ * @param $query
+ * @return mixed
+ * @since 2.0.5
+ */
+function loadObjectList($db, $query): mixed
+{
+    try {
+        $db->setQuery($query);
+        $objList = $db->loadObjectList();
+    } catch (RuntimeException $e) {
+        Log::add("Database error: " . $e->getMessage(), Log::ERROR, "com_sportsmanager");
+        if(isJson()) {
+            abortWithError($e->getMessage());
+        } else {
+            throw $e;
+        }
+    }
+    return $objList;
+}
+
+/**
+ * @param $db
+ * @param $query
+ * @return mixed
+ * @since 2.0.5
+ */
+function loadResult($db, $query): mixed
+{
+    try {
+        $db->setQuery($query);
+        $result = $db->loadResult();
+    } catch (RuntimeException $e) {
+        Log::add("Database error: " . $e->getMessage(), Log::ERROR, "com_sportsmanager");
+        if(isJson()) {
+            abortWithError($e->getMessage());
+        } else {
+            throw $e;
+        }
+    }
+    return $result;
+}

src/structure/components/com_sportsmanager/images/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/components/com_sportsmanager/models/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/components/com_sportsmanager/src/Controller/DisplayController.php

@@ -0,0 +1,45 @@
+<?php
+namespace Dtfb\Component\com_sportsmanager\Site\Controller;
+/*
+ * Sports Manager (C) 2006-2020, Sven Nickel
+ */
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die();
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\BaseController;
+
+/**
+ * @package     SportsManager.Site
+ * @subpackage  com_sportsmanager
+ *
+ * @copyright   Copyright (C) 2020 John Smith. All rights reserved.
+ * @license     GNU General Public License version 3; see LICENSE
+ */
+
+/**
+ * Class DisplayController
+ * @since 2.0.0
+ * The DisplayController class handles the display of views in the application.
+ * It extends the BaseController class.
+ */
+class DisplayController extends BaseController {
+
+    /**
+     * Displays the view for the given URL parameters.
+     *
+     * @param   bool   $cachable       Whether the view can be cached or not. Default is false.
+     * @param   array  $urlparams      The URL parameters to be passed to the view. Default is an empty array.
+     * @param array|null $safeurlparams  An associative array of 'safe' URL parameters and their variable types.
+     *
+     * @return void
+     * @throws Exception
+     * @since 2.0.0
+     */
+    public function display($cachable = false, $urlparams = array(), array $safeurlparams = null): void
+    {
+        require_once JPATH_SITE . '/components/com_sportsmanager/sportsmanager.php';
+    }
+}
+

src/structure/components/com_sportsmanager/tools.php

@@ -4,57 +4,77 @@
  */
 
 // kein direkter Zugriff
+use JetBrains\PhpStorm\NoReturn;
+use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Version;
+
 defined('_JEXEC') or die('Restricted access');
 
-require_once (JPATH_COMPONENT.DIRECTORY_SEPARATOR.'mathparser.php');
+require_once JPATH_SITE . '/components/com_sportsmanager/mathparser.php';
+require_once JPATH_SITE . '/components/com_sportsmanager/database/init.php';
 
+/** @noinspection PhpUnused */
 function mathParserVerteilung($rohpunkte, $platz, $teilnehmer, $multiplikator) {
     return max(round($multiplikator * round(((($rohpunkte - 1) * (-log($platz / $teilnehmer) * (1 - ($platz / $teilnehmer)))) / (-log(1 / $teilnehmer) * (1 - (1 / $teilnehmer)))) + 1)), 1);
 }
 
+/** @noinspection PhpUnused */
 function mathParserVerteilungR($rohpunkte, $platz, $teilnehmer, $multiplikator) {
     return max(round(((($multiplikator * $rohpunkte - 1) * (-log($platz / $teilnehmer) * (1 - ($platz / $teilnehmer)))) / (-log(1 / $teilnehmer) * (1 - (1 / $teilnehmer)))) + 1), 1);
 }
 
-class MathParserSM extends MathParser {
+class MathParserSM extends MathParser
+{
     // Verteilung nach Klostermann/Wahle
-	public function __construct() {
+    public function __construct()
-		MathParser::__construct();
+    {
-	  $this->createFunc("ROUND", round, 1);
+        parent::__construct();
-	  $this->createFunc("VERTEILUNG", mathParserVerteilung, 4);
+        try {
-	  $this->createFunc("VERTEILUNGR", mathParserVerteilungR, 4);
+            $this->createFunc("ROUND", 'round', 1);
+            $this->createFunc("VERTEILUNG", 'mathParserVerteilung', 4);
+            $this->createFunc("VERTEILUNGR", 'mathParserVerteilungR', 4);
+        } catch (Exception $e) {
+            Log::add('an error occurred: ' . $e->getMessage(), Log::ERROR, 'com_sportsmanager');
+            throw new RuntimeException('An error occurred.', 500);
+        }
     }
 }
 
-function keinZugriff($login = FALSE) {
+#[NoReturn] function keinZugriff($login = FALSE): void
+{
     if (isJson()) {
         abortWithError(401 . ' Unauthorized');
     }
-	if (!$login || JFactory::getUser()->id) {
+    if (!$login || Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id) {
-		JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+        Log::add('Unauthorized user with id ' . Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id, Log::WARNING, 'com_sportsmanager');
-		jexit();
+        throw new RuntimeException('Not authorized!', 401);
     }
-	$version = new JVersion;
+    $version = new Version();
     $joomla = $version->getShortVersion();
-	$u =& JFactory::getURI();
+    $u = Uri::getInstance();
     $redirectUrl = urlencode(base64_encode($u->toString()));
-	$redirectUrl = '&return='.$redirectUrl;
+    $redirectUrl = '&return=' . $redirectUrl;
-	$joomlaLoginUrl = 'index.php?option=' . (substr($joomla, 0, 3) != '1.5' ? 'com_users' : 'com_user') . '&view=login';
+    $joomlaLoginUrl = 'index.php?option=' . (!str_starts_with($joomla, '1.5') ? 'com_users' : 'com_user') . '&view=login';
     $finalUrl = $joomlaLoginUrl . $redirectUrl;
-	$app = &JFactory::getApplication();
+    $app = Factory::getContainer()->get(SiteApplication::class);
-	$app->redirect(JRoute::_($finalUrl));
+    $app->redirect(Route::_($finalUrl));
     jexit();
 }
 
-function bereinigterDateiname($dateiname) {
+function bereinigterDateiname($dateiname): array|string
+{
     $_convertTable = array(
         '&' => 'and', '@' => 'at', '©' => 'c', '®' => 'r', 'À' => 'a',
-		'Á' => 'a', 'Â' => 'a', 'Ä' => 'a', 'Å' => 'a', 'Æ' => 'ae','Ç' => 'c',
+        'Á' => 'a', 'Â' => 'a', 'Ä' => 'a', 'Å' => 'a', 'Æ' => 'ae', 'Ç' => 'c',
         'È' => 'e', 'É' => 'e', 'Ë' => 'e', 'Ì' => 'i', 'Í' => 'i', 'Î' => 'i',
         'Ï' => 'i', 'Ò' => 'o', 'Ó' => 'o', 'Ô' => 'o', 'Õ' => 'o', 'Ö' => 'o',
         'Ø' => 'o', 'Ù' => 'u', 'Ú' => 'u', 'Û' => 'u', 'Ü' => 'u', 'Ý' => 'y',
-		'ß' => 'ss','à' => 'a', 'á' => 'a', 'â' => 'a', 'ä' => 'a', 'å' => 'a',
+        'ß' => 'ss', 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ä' => 'a', 'å' => 'a',
-		'æ' => 'ae','ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
+        'æ' => 'ae', 'ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
         'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ò' => 'o', 'ó' => 'o',
         'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o', 'ù' => 'u', 'ú' => 'u',
         'û' => 'u', 'ü' => 'u', 'ý' => 'y', 'þ' => 'p', 'ÿ' => 'y', 'Ā' => 'a',
@@ -66,12 +86,12 @@ function bereinigterDateiname($dateiname) {
         'ğ' => 'g', 'Ġ' => 'g', 'ġ' => 'g', 'Ģ' => 'g', 'ģ' => 'g', 'Ĥ' => 'h',
         'ĥ' => 'h', 'Ħ' => 'h', 'ħ' => 'h', 'Ĩ' => 'i', 'ĩ' => 'i', 'Ī' => 'i',
         'ī' => 'i', 'Ĭ' => 'i', 'ĭ' => 'i', 'Į' => 'i', 'į' => 'i', 'İ' => 'i',
-		'ı' => 'i', 'IJ' => 'ij','ij' => 'ij','Ĵ' => 'j', 'ĵ' => 'j', 'Ķ' => 'k',
+        'ı' => 'i', 'IJ' => 'ij', 'ij' => 'ij', 'Ĵ' => 'j', 'ĵ' => 'j', 'Ķ' => 'k',
         'ķ' => 'k', 'ĸ' => 'k', 'Ĺ' => 'l', 'ĺ' => 'l', 'Ļ' => 'l', 'ļ' => 'l',
         'Ľ' => 'l', 'ľ' => 'l', 'Ŀ' => 'l', 'ŀ' => 'l', 'Ł' => 'l', 'ł' => 'l',
         'Ń' => 'n', 'ń' => 'n', 'Ņ' => 'n', 'ņ' => 'n', 'Ň' => 'n', 'ň' => 'n',
         'ʼn' => 'n', 'Ŋ' => 'n', 'ŋ' => 'n', 'Ō' => 'o', 'ō' => 'o', 'Ŏ' => 'o',
-		'ŏ' => 'o', 'Ő' => 'o', 'ő' => 'o', 'Œ' => 'oe','œ' => 'oe','Ŕ' => 'r',
+        'ŏ' => 'o', 'Ő' => 'o', 'ő' => 'o', 'Œ' => 'oe', 'œ' => 'oe', 'Ŕ' => 'r',
         'ŕ' => 'r', 'Ŗ' => 'r', 'ŗ' => 'r', 'Ř' => 'r', 'ř' => 'r', 'Ś' => 's',
         'ś' => 's', 'Ŝ' => 's', 'ŝ' => 's', 'Ş' => 's', 'ş' => 's', 'Š' => 's',
         'š' => 's', 'Ţ' => 't', 'ţ' => 't', 'Ť' => 't', 'ť' => 't', 'Ŧ' => 't',
@@ -83,19 +103,19 @@ function bereinigterDateiname($dateiname) {
         'ư' => 'u', 'Ǎ' => 'a', 'ǎ' => 'a', 'Ǐ' => 'i', 'ǐ' => 'i', 'Ǒ' => 'o',
         'ǒ' => 'o', 'Ǔ' => 'u', 'ǔ' => 'u', 'Ǖ' => 'u', 'ǖ' => 'u', 'Ǘ' => 'u',
         'ǘ' => 'u', 'Ǚ' => 'u', 'ǚ' => 'u', 'Ǜ' => 'u', 'ǜ' => 'u', 'Ǻ' => 'a',
-		'ǻ' => 'a', 'Ǽ' => 'ae','ǽ' => 'ae','Ǿ' => 'o', 'ǿ' => 'o', 'ə' => 'e',
+        'ǻ' => 'a', 'Ǽ' => 'ae', 'ǽ' => 'ae', 'Ǿ' => 'o', 'ǿ' => 'o', 'ə' => 'e',
-		'Ё' => 'jo','Є' => 'e', 'І' => 'i', 'Ї' => 'i', 'А' => 'a', 'Б' => 'b',
+        'Ё' => 'jo', 'Є' => 'e', 'І' => 'i', 'Ї' => 'i', 'А' => 'a', 'Б' => 'b',
-		'В' => 'v', 'Г' => 'g', 'Д' => 'd', 'Е' => 'e', 'Ж' => 'zh','З' => 'z',
+        'В' => 'v', 'Г' => 'g', 'Д' => 'd', 'Е' => 'e', 'Ж' => 'zh', 'З' => 'z',
         'И' => 'i', 'Й' => 'j', 'К' => 'k', 'Л' => 'l', 'М' => 'm', 'Н' => 'n',
         'О' => 'o', 'П' => 'p', 'Р' => 'r', 'С' => 's', 'Т' => 't', 'У' => 'u',
-		'Ф' => 'f', 'Х' => 'h', 'Ц' => 'c', 'Ч' => 'ch','Ш' => 'sh','Щ' => 'sch',
+        'Ф' => 'f', 'Х' => 'h', 'Ц' => 'c', 'Ч' => 'ch', 'Ш' => 'sh', 'Щ' => 'sch',
-		'Ъ' => '-', 'Ы' => 'y', 'Ь' => '-', 'Э' => 'je','Ю' => 'ju','Я' => 'ja',
+        'Ъ' => '-', 'Ы' => 'y', 'Ь' => '-', 'Э' => 'je', 'Ю' => 'ju', 'Я' => 'ja',
         'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e',
-		'ж' => 'zh','з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
+        'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
         'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r', 'с' => 's',
         'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'h', 'ц' => 'c', 'ч' => 'ch',
-		'ш' => 'sh','щ' => 'sch','ъ' => '-','ы' => 'y', 'ь' => '-', 'э' => 'je',
+        'ш' => 'sh', 'щ' => 'sch', 'ъ' => '-', 'ы' => 'y', 'ь' => '-', 'э' => 'je',
-		'ю' => 'ju','я' => 'ja','ё' => 'jo','є' => 'e', 'і' => 'i', 'ї' => 'i',
+        'ю' => 'ju', 'я' => 'ja', 'ё' => 'jo', 'є' => 'e', 'і' => 'i', 'ї' => 'i',
         'Ґ' => 'g', 'ґ' => 'g', 'א' => 'a', 'ב' => 'b', 'ג' => 'g', 'ד' => 'd',
         'ה' => 'h', 'ו' => 'v', 'ז' => 'z', 'ח' => 'h', 'ט' => 't', 'י' => 'i',
         'ך' => 'k', 'כ' => 'k', 'ל' => 'l', 'ם' => 'm', 'מ' => 'm', 'ן' => 'n',
@@ -103,146 +123,181 @@ function bereinigterDateiname($dateiname) {
         'צ' => 'c', 'ק' => 'q', 'ר' => 'r', 'ש' => 'w', 'ת' => 't', '™' => 'tm',
     );
     $bad = array_merge(
-        array_map('chr', range(0,31)),
+        array_map('chr', range(0, 31)),
         array("<", ">", ":", '"', "/", "\\", "|", "?", "*"));
 
     return str_replace($bad, "", strtr($dateiname, $_convertTable));
 }
 
-function setMinMemoryLimit($memDestSize) {
+function setMinMemoryLimit($memDestSize): void
+{
     if (getBytes(ini_get('memory_limit')) < getBytes($memDestSize))
         ini_set('memory_limit', $memDestSize);
 }
 
-function getBytes($val) {
+function getBytes($val): int|string
+{
     $val = trim($val);
-	$last = strtolower($val{strlen($val)-1});
+    $numeric = substr($val, 0, strlen($val) - 1);
-	switch($last) {
+    $last = strtolower($val[strlen($val) - 1]);
+    switch ($last) {
         // The 'G' modifier is available since PHP 5.1.0
-		case 'g':
-		  $val *= 1024;
         case 'm':
-		  $val *= 1024;
+        case 'g':
         case 'k':
-		  $val *= 1024;
+            $numeric *= 1024;
+            break;
     }
-	return $val;
+    return $numeric;
 }
 
-function encrypt($str, $key){
+function encrypt($str, $key): string
-  $result="";
+{
-  for($i=0; $i<strlen($str); $i++) {
+    $result = "";
+    for ($i = 0; $i < strlen($str); $i++) {
         $char = substr($str, $i, 1);
-     $keychar = substr($key, ($i % strlen($key))-1, 1);
+        $keychar = substr($key, ($i % strlen($key)) - 1, 1);
-     $char = chr(ord($char)+ord($keychar));
+        $char = chr(ord($char) + ord($keychar));
-     $result.=$char;
+        $result .= $char;
     }
     return base64_encode($result);
 }
 
-function decrypt($str, $key){
+function decrypt($str, $key): string
+{
     $str = base64_decode($str);
-  $result="";
+    $result = "";
-  for($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $char = substr($str, $i, 1);
-    $keychar = substr($key, ($i % strlen($key))-1, 1);
+        $keychar = substr($key, ($i % strlen($key)) - 1, 1);
-    $char = chr(ord($char)-ord($keychar));
+        $char = chr(ord($char) - ord($keychar));
-    $result.=$char;
+        $result .= $char;
     }
     return $result;
 }
 
-function individualwettbewerbFilter($prefix) {
+function individualwettbewerbFilter($prefix): string
-	$db =& getDatabase();
+{
-	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->id;
+    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
     return " " . $prefix . " (SELECT berechtigt_individualwettbewerb_id FROM #__sportsmanager_berechtigt_fuer_individualwettbewerb INNER JOIN #__sportsmanager_individualwettbewerb ON individualwettbewerb_id = berechtigt_individualwettbewerb_id WHERE berechtigt_user_id = $user_id) ";
 }
 
-function kategorieFilter($prefix, $suffix = "") {
+function kategorieFilter($prefix, $suffix = ""): string
+{
     global $params;
-	$kategorien = explode(",", $params->get( 'kategorien' ));
+
-	$filter = "";
+    $kategorien = explode(",", $params->get('kategorien'));
-	foreach ($kategorien as $s) {
+    $result = [];
-		$kategorie = intval(trim($s));
+
-		if ($kategorie == 0)
+    foreach ($kategorien as $item) {
-			continue;
+        $item = trim($item);
-		if (!empty($filter))
+        if ($item === '') continue;
-			$filter .= ", ";
+
-		$filter .= $kategorie;
+        // Prüfen, ob es ein Bereich ist
+        if (strpos($item, '-') !== false) {
+            $rangeParts = explode('-', $item);
+
+            // genau 2 Teile für einen gültigen Bereich
+            if (count($rangeParts) !== 2) continue;
+
+            $start = intval(trim($rangeParts[0]));
+            $end = intval(trim($rangeParts[1]));
+
+            if ($start <= 0 || $end <= 0 || $start > $end) continue;
+
+            for ($i = $start; $i <= $end; $i++) {
+                $result[$i] = true; // Duplikate vermeiden
             }
-	return empty($filter) ? "" : (" " . $prefix . " (" . $filter . ") " . $suffix);
+        } else {
+            $num = intval($item);
+            if ($num > 0) {
+                $result[$num] = true;
+            }
+        }
+    }
+
+    if (empty($result)) {
+        return "";
+    }
+
+    $filter = array_keys($result);
+    sort($filter, SORT_NUMERIC);
+
+    return " $prefix (" . implode(", ", $filter) . ") $suffix";
 }
 
-function turnierFilter($prefix) {
+function turnierFilter($prefix): string
-	$db =& getDatabase();
+{
-	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->id;
+    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
-	return " " . $prefix . " (SELECT berechtigt_turnier_id FROM #__sportsmanager_berechtigt_fuer_turnier WHERE berechtigt_user_id = $user_id AND DATEDIFF(letzter_tag, NOW()) >= -14) ";
+    return " " . $prefix . " (SELECT berechtigt_turnier_id FROM #__sportsmanager_berechtigt_fuer_turnier WHERE berechtigt_user_id = $user_id AND DATEDIFF(letzter_tag, NOW()) >= -21) ";
 }
 
-function vereinFilter($prefix) {
+function vereinFilter($prefix): string
-	$db =& getDatabase();
+{
-	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->id;
+    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
     return " " . $prefix . " (SELECT berechtigt_verein_id FROM #__sportsmanager_berechtigt_fuer_verein INNER JOIN #__sportsmanager_verein ON berechtigt_verein_id = verein_id WHERE berechtigt_user_id = $user_id AND NOT ausgetreten) ";
 }
 
-function veranstalterFilter($prefix) {
+function veranstalterFilter($prefix): string
-	$db =& getDatabase();
+{
-	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->id;
+    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
     return " " . $prefix . " (SELECT berechtigt_veranstalter_id FROM #__sportsmanager_berechtigt_fuer_veranstalter WHERE berechtigt_user_id = $user_id) ";
 }
 
-function veranstaltungFilter($prefix) {
+function veranstaltungFilter($prefix): string
-	$db =& getDatabase();
+{
-	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->id;
+    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
-	return " " . $prefix . " (SELECT berechtigt_veranstaltung_id FROM #__sportsmanager_berechtigt_fuer_veranstaltung INNER JOIN #__sportsmanager_veranstaltung ON veranstaltung_id = berechtigt_veranstaltung_id WHERE berechtigt_user_id = $user_id AND DATEDIFF(letzter_tag, NOW()) >= -14) ";
+    return " " . $prefix . " (SELECT berechtigt_veranstaltung_id FROM #__sportsmanager_berechtigt_fuer_veranstaltung INNER JOIN #__sportsmanager_veranstaltung ON veranstaltung_id = berechtigt_veranstaltung_id WHERE berechtigt_user_id = $user_id AND DATEDIFF(letzter_tag, NOW()) >= -21) ";
 }
 
 // Berechnet Datum zum Montag der ersten Kalenderwoche eines Jahres
-function firstkw($jahr) {
+function firstkw($jahr): bool|int
-  $erster = mktime(0,0,0,1,1,$jahr);
+{
-  $wtag = date('w',$erster);
+    $erster = mktime(0, 0, 0, 1, 1, $jahr);
+    $wtag = date('w', $erster);
     if ($wtag <= 4) {
         /**
          * Donnerstag oder kleiner: auf den Montag zurückrechnen.
          */
-       $montag = mktime(0,0,0,1,1-($wtag-1),$jahr);
+        $montag = mktime(0, 0, 0, 1, 1 - ($wtag - 1), $jahr);
-   }
+    } else {
-   else {
         /**
          * auf den Montag nach vorne rechnen.
          */
-       $montag = mktime(0,0,0,1,1+(7-$wtag+1),$jahr);
+        $montag = mktime(0, 0, 0, 1, 1 + (7 - $wtag + 1), $jahr);
     }
     return $montag;
 }
 
 // Berechnet Wochentag über Kalenderwoche, Jahr und Wochentag (0 = Montag, ...,  6 = Sonntag)
-function mondaykw($kw, $jahr, $weekday) {
+function mondaykw($kw, $jahr, $weekday): bool|int
+{
     $firstmonday = firstkw($jahr);
-  $mon_monat = date('m',$firstmonday);
+    $mon_monat = date('m', $firstmonday);
-  $mon_jahr = date('Y',$firstmonday);
+    $mon_jahr = date('Y', $firstmonday);
-  $mon_tage = date('d',$firstmonday);
+    $mon_tage = (int)date('d', $firstmonday);
-  $tage = ($kw-1)*7;
+    $tage = ($kw - 1) * 7;
-  $daykw = mktime(0,0,0,$mon_monat,$mon_tage+$tage+$weekday,$mon_jahr);
+    return mktime(0, 0, 0, $mon_monat, $mon_tage + $tage + $weekday, $mon_jahr);
-  return $daykw;
 }
 
 // Berechnet Termin am Wochentag (0 = Montag, ...,  6 = Sonntag) in Kalenderwoche zum Datum
-function geaenderterWochentag($datum, $wochentag) {
+function geaenderterWochentag($datum, $wochentag): bool|int
+{
     $wtag = date('w', $datum);
     if ($wtag == 0) // Sonntag
         $wtag = 7;
     $mon_monat = date('m', $datum);
     $mon_jahr = date('Y', $datum);
-  $mon_tage = date('d', $datum);
+    $mon_tage = (int)date('d', $datum);
-  return mktime(0,0,0, $mon_monat, $mon_tage + 1 - $wtag + $wochentag, $mon_jahr);
+    return mktime(0, 0, 0, $mon_monat, $mon_tage + 1 - $wtag + $wochentag, $mon_jahr);
 }
 
-function normalisiertesDatum($datum) {
+function normalisiertesDatum($datum): ?string
+{
     if ($datum == NULL)
         return NULL;
 
-	if (strpos($datum, "-") !== false)
+    if (str_contains($datum, "-"))
         $trennzeichen = "-";
     else
         $trennzeichen = ".";
@@ -256,37 +311,35 @@ function normalisiertesDatum($datum) {
         $jahr = intval(substr($s, 0, 4));
         $monat = intval(substr($s, 4, 2));
         $tag = intval(substr($s, 6, 2));
-	}
+    } else if ($n == 3) {
-	else if ($n == 3) {
         if ($trennzeichen != ".") {
             $jahr = intval($t[0]);
             if (strlen($t[0]) <= 2)
                 $jahr += 1900;
             $monat = intval($t[1]);
             $tag = intval($t[2]);
-		}
+        } else {
-		else {
             $tag = intval($t[0]);
             $monat = intval($t[1]);
             $jahr = intval($t[2]);
             if (strlen($t[2]) <= 2)
                 $jahr += 1900;
         }
-	}
+    } else
-	else
         return NULL;
 
     if (!checkdate($monat, $tag, $jahr))
         return NULL;
 
-	return sprintf("%04d-%02d-%02d", $jahr, $monat, $tag);;
+    return sprintf("%04d-%02d-%02d", $jahr, $monat, $tag);
 }
 
-function normalisierteUhrzeit($uhrzeit) {
+function normalisierteUhrzeit($uhrzeit): ?string
+{
     if ($uhrzeit == NULL)
         return NULL;
 
-	if (strpos($uhrzeit, "-") !== FALSE)
+    if (str_contains($uhrzeit, "-"))
         $trennzeichen = "-";
     else
         $trennzeichen = ":";
@@ -301,22 +354,21 @@ function normalisierteUhrzeit($uhrzeit) {
         $stunden = intval(substr($s, 0, 2));
         $minuten = intval(substr($s, 2, 2));
         $sekunden = $len != 6 ? 0 : intval(substr($s, 4, 2));
-	}
+    } else if ($n == 2 || $n == 3) {
-	else if ($n == 2 || $n == 3) {
         $stunden = intval($t[0]);
         $minuten = intval($t[1]);
         $sekunden = $n != 3 ? 0 : intval($t[2]);
-	}
+    } else
-	else
         return NULL;
 
     if ($stunden < 0 || $stunden > 23 || $minuten < 0 || $minuten > 59 || $sekunden < 0 || $sekunden > 59)
         return NULL;
 
-	return sprintf("%02d:%02d:%02d", $stunden, $minuten, $sekunden);;
+    return sprintf("%02d:%02d:%02d", $stunden, $minuten, $sekunden);
 }
 
-function runden_detailliert_invers($runden) {
+function runden_detailliert_invers($runden): ?string
+{
     if ($runden == null)
         return null;
     $runden_invers = "";
@@ -330,7 +382,8 @@ function runden_detailliert_invers($runden) {
     return $runden_invers;
 }
 
-function runden_detailliert_auswertung($runden) {
+function runden_detailliert_auswertung($runden): array
+{
     $ergebnis = 0;
     $heim_saetze = 0;
     $unentschieden_saetze = 0;
@@ -360,29 +413,30 @@ function runden_detailliert_auswertung($runden) {
 
 //   pass two file names
 //   returns TRUE if files are the same, FALSE otherwise
-function files_identical($fn1, $fn2) {
+function files_identical($fn1, $fn2): bool
-	if(!is_file($fn1) || !is_file($fn2))
+{
+    if (!is_file($fn1) || !is_file($fn2))
         return FALSE;
 
-	if(filesize($fn1) !== filesize($fn2))
+    if (filesize($fn1) !== filesize($fn2))
         return FALSE;
 
-	if(!$fp1 = fopen($fn1, 'rb'))
+    if (!$fp1 = fopen($fn1, 'rb'))
         return FALSE;
 
-	if(!$fp2 = fopen($fn2, 'rb')) {
+    if (!$fp2 = fopen($fn2, 'rb')) {
         fclose($fp1);
         return FALSE;
     }
 
     $same = TRUE;
     while (!feof($fp1) and !feof($fp2))
-		if(fread($fp1, 4096) !== fread($fp2, 4096)) {
+        if (fread($fp1, 4096) !== fread($fp2, 4096)) {
             $same = FALSE;
             break;
         }
 
-	if(feof($fp1) !== feof($fp2))
+    if (feof($fp1) !== feof($fp2))
         $same = FALSE;
 
     fclose($fp1);
@@ -390,4 +444,4 @@ function files_identical($fn1, $fn2) {
 
     return $same;
 }
-?>
+

src/structure/components/com_sportsmanager/util/email.php

@@ -0,0 +1,125 @@
+<?php
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailerFactoryInterface;
+use Joomla\CMS\Application\SiteApplication;
+
+/**
+ * @since 2.2
+ * @throws Exception
+ */
+function sentEmailReminders(): void
+{
+    $app = Factory::getContainer()->get(SiteApplication::class);
+    $db = getDatabase();
+
+    $query = $db->getQuery(true)
+        ->select('wert')
+        ->from('#__sportsmanager_einstellungen')
+        ->where('name = ' . $db->quote('enable_email_reminders'));
+    $row = loadResult($db, $query);
+
+    if (!$row) {
+        return; // quit when email reminders are disabled
+    }
+
+    $query = $db->getQuery(true)
+        ->select('tournament.turnier_id, tournament.turnierbezeichnung, tournament.letzter_tag, tournament.reminder_count, GROUP_CONCAT(user.email SEPARATOR ", ") as emails')
+        ->from($db->quoteName('#__sportsmanager_turnier', 'tournament'))
+        ->join('INNER', $db->quoteName('#__sportsmanager_berechtigt_fuer_turnier', 'entitled') . ' ON tournament.turnier_id = entitled.berechtigt_turnier_id')
+        ->join('INNER', $db->quoteName('#__users', 'user') . ' ON entitled.berechtigt_user_id = user.id')
+        ->where('tournament.reminder_count < 3')
+        ->group('tournament.turnier_id, tournament.turnierbezeichnung');
+    $rows = loadObjectList($db, $query);
+
+    if(!empty($rows)) {
+        $mailFrom = $app->getCfg('mailfrom');
+        $fromName = $app->getCfg('fromname');
+
+        $mailer = Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
+        $mailer->setSender($mailFrom, $fromName);
+        foreach ($rows as $row) {
+            $currentReminder = $row->reminder_count + 1;
+
+            if (hasResultsAlready($db, $row)) {
+                updateDBReminders($db, $row, 3); // do not sent any more reminders
+                continue;
+            }
+
+            if (!isset($row->emails) || $row->emails == "" || $row->emails == NULL) {
+                Log::add('can\'t sent ' . $currentReminder .'. email reminder for tournament ' . $row->turnierbezeichnung . ': no recipient set', Log::WARNING, 'com_sportsmanager');
+                continue;
+            }
+
+            $now = new DateTime();
+            $last_day = new DateTime($row->letzter_tag);
+            $last_day->modify('+1 day'); // start to count at the end of the day, not at the beginning
+            $diff = $now->getTimestamp() - $last_day->getTimestamp();
+
+            $reminderDelays = [
+                1 => 24*60*60,       // 24h
+                2 => 3*24*60*60,     // 3d
+                3 => 13*24*60*60     // 13d
+            ];
+
+            foreach ($reminderDelays as $count => $delay) {
+                if ($diff >= $delay && $row->reminder_count < $count) {
+                    $subject = ($row->reminder_count == 2 ? "Letzte " : "") . "Erinnerung: " . $row->turnierbezeichnung . " Ergebnisse einreichen!";
+                    $body = "Hi,"
+                        . "\n\nDies ist die " . $currentReminder . ". " . ($row->reminder_count == 2 ? "*und damit letzte* " : "") . "Erinnerung die Turnierergebnisse einzureichen."
+                        . "\n\nTurnier: " . $row->turnierbezeichnung
+                        . "\nTurnierende: " . FormatiertesDatum($row->letzter_tag, false, false)
+                        . "\n\nLaut Turnierordnung müssen die Ergebnisse spätestens 24 Stunden nach Turnierende eingetragen werden. Bitte reich die Ergebnisse umgehend nach."
+                        . "\n\nDu erhältst diese Mail, weil du als Berechtigter für das Turnier eingetragen wurdest. Falls du nicht der Veranstalter bist, leite diese Email bitte entsprechend weiter."
+                        . "\n\nHochladen der Ergebnisse über " . SportsManagerURL('&task=admin_turnierdisziplinen&turnierid=' . $row->turnier_id, -1) . ".";
+
+                    $mailer->setSubject($subject);
+                    $mailer->setBody($body);
+
+                    $emailArray = explode(", ", $row->emails);
+                    foreach ($emailArray as $email) {
+                        $mailer->addBcc($email);
+                    }
+                    $mailer->send();
+
+                    updateDBReminders($db, $currentReminder, $row->turnier_id);
+                }
+            }
+        }
+    }
+}
+
+function updateDBReminders($db, $reminder, $tournamentId): void
+{
+    $query = $db->getQuery(true)
+        ->update($db->quoteName('#__sportsmanager_turnier'))
+        ->set($db->quoteName('reminder_count') . ' = ' . $db->quote($reminder))
+        ->where($db->quoteName('turnier_id') . ' = ' . $db->quote($tournamentId));
+
+    $db->setQuery($query);
+    $db->execute();
+}
+
+/**
+ * checks if a tournament has at least one result entry for a discipline
+ * @param $db
+ * @param $row mixed tournament entry
+ * @return bool true if at least one result is given, else false
+ * @since 2.2
+ */
+function hasResultsAlready($db, mixed $row): bool
+{
+    $subQuery = $db->getQuery(true)
+        ->select($db->quoteName('turnierdisziplin_id'))
+        ->from($db->quoteName('#__sportsmanager_turnierdisziplin'))
+        ->where($db->quoteName('turnier_id') . ' = ' . $db->quote($row->turnier_id));
+
+    $query = $db->getQuery(true)
+        ->select('COUNT(*) AS count')
+        ->from($db->quoteName('#__sportsmanager_turniermeldung', 'tm'))
+        ->where($db->quoteName('tm.turnierdisziplin_id') . ' IN (' . $subQuery . ')');
+
+    $result = loadResult($db, $query);
+    return $result && $result[0]->count > 0;
+}

src/structure/components/com_sportsmanager/util/image.php

@@ -0,0 +1,475 @@
+<?php
+
+use JetBrains\PhpStorm\NoReturn;
+use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
+
+require_once JPATH_SITE . '/components/com_sportsmanager/database/util.php';
+
+const SPORTSMANAGER_JOOMLA_PATH = JPATH_ROOT;
+define("SPORTSMANAGER_JOOMLA_URL", Uri::base());
+
+function bildKopierenAngepasst($quelle, $ziel, $ziel_breite, $ziel_hoehe, $zuschneiden): bool
+{
+    $len = strlen($ziel);
+    if ($len < 4 || $ziel[$len - 4] != ".")
+        return false;
+    $ext = strtolower(substr($ziel, $len - 3));
+    if ($ext != "jpg" && $ext != "png")
+        return false;
+    $quelle_image = $ext == "png" ? imagecreatefrompng($quelle) : imagecreatefromjpeg($quelle);
+    if ($quelle_image === false)
+        return false;
+    $quelle_breite = imagesx($quelle_image);
+    $quelle_hoehe = imagesy($quelle_image);
+    if ($quelle_breite == $ziel_breite && $quelle_hoehe == $ziel_hoehe)
+        return File::copy($quelle, $ziel);
+
+    $ziel_image = imagecreatetruecolor($ziel_breite, $ziel_hoehe);
+    $hintergrund = $ext == "png" ? imagecolorallocatealpha($ziel_image, 0, 0, 0, 127) : imagecolorallocate($ziel_image, 64, 64, 64);
+    imagefill($ziel_image, 0, 0, $hintergrund);
+    $quelle_proportionen = $quelle_breite / $quelle_hoehe;
+    $ziel_proportionen = $ziel_breite / $ziel_hoehe;
+    if ($zuschneiden) {
+        if ($ziel_proportionen >= $quelle_proportionen) {
+            $quelle_teilhoehe = round($quelle_breite / $ziel_proportionen);
+            if (!imagecopyresampled($ziel_image, $quelle_image, 0, 0, 0, round(($quelle_hoehe - $quelle_teilhoehe) / 2), $ziel_breite, $ziel_hoehe, $quelle_breite, $quelle_teilhoehe))
+                return false;
+        } else {
+            $quelle_teilbreite = round($quelle_hoehe * $ziel_proportionen);
+            if (!imagecopyresampled($ziel_image, $quelle_image, 0, 0, round(($quelle_breite - $quelle_teilbreite) / 2), 0, $ziel_breite, $ziel_hoehe, $quelle_teilbreite, $quelle_hoehe))
+                return false;
+        }
+    } else {
+        if ($ziel_proportionen >= $quelle_proportionen) {
+            $ziel_teilbreite = round($ziel_hoehe * $quelle_proportionen);
+            if (!imagecopyresampled($ziel_image, $quelle_image, round(($ziel_breite - $ziel_teilbreite) / 2), 0, 0, 0, $ziel_teilbreite, $ziel_hoehe, $quelle_breite, $quelle_hoehe))
+                return false;
+        } else {
+            $ziel_teilhoehe = round($ziel_breite / $quelle_proportionen);
+            if (!imagecopyresampled($ziel_image, $quelle_image, 0, round(($ziel_hoehe - $ziel_teilhoehe) / 2), 0, 0, $ziel_breite, $ziel_teilhoehe, $quelle_breite, $quelle_hoehe))
+                return false;
+        }
+    }
+    ob_start();
+    if ($ext == "png") {
+        imagesavealpha($ziel_image, true);
+        if (!imagepng($ziel_image))
+            return false;
+    } else {
+        if (!imagejpeg($ziel_image))
+            return false;
+    }
+    $output = ob_get_contents();
+    ob_end_clean();
+    File::write($ziel, $output);
+    return true;
+}
+
+#[NoReturn] function bildAnpassen($typ, $id = 0): void
+{
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+
+    if (empty($id))
+        $id = $jInput->get('id', 0, 'INT');
+    $fixed_width = $jInput->get('w', 0, 'INT');
+    $fixed_height = $jInput->get('h', 0, 'INT');
+    $max_width = $jInput->get('mw', 0, 'INT');
+    $max_height = $jInput->get('mh', 0, 'INT');
+    $no_cache = $jInput->get('nc', 0, 'INT');
+
+    $pfad = SPORTSMANAGER_JOOMLA_PATH . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ . DIRECTORY_SEPARATOR . $id . '.';
+    if (file_exists($pfad . 'png') && is_file($pfad . 'png'))
+        $ext = "png";
+    else if (file_exists($pfad . 'png') && is_file($pfad . 'png'))
+        $ext = "jpg";
+    else {
+        ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
+        header('HTTP/1.1 404 Not Found');
+        die();
+    }
+
+    $filemtime = filemtime($pfad . $ext);
+    $last_modified = gmdate('D, d M Y H:i:s', $filemtime) . " GMT";
+    $etag = md5($id . '.' . $ext . $filemtime);
+
+    // Prüfung, ob die im Browsercache vorhandene Datei der hiesigen entspricht
+    if ($_SERVER['HTTP_IF_NONE_MATCH'] == '"' . $etag . '"' || $last_modified == $_SERVER['HTTP_IF_MODIFIED_SINCE']) {
+        ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
+        header('HTTP/1.1 304 Not Modified');
+        if ($no_cache)
+            header("Cache-Control: must-revalidate"); // Bewirkt, dass der Browser jedesmal die Datei neu prüft
+        else
+            header("Cache-Control: max-age=2592000");  // Bewirkt, dass nach dreißig Tagen die Datei vom Browser auf eine Aktualisierung geprüft wird.
+        header("Last-Modified: " . $last_modified);
+        header('ETag: "' . $etag . '"');
+        die();
+    }
+
+    $image = $ext == "png" ? imagecreatefrompng($pfad . $ext) : imagecreatefromjpeg($pfad . $ext);
+    if ($image === false) {
+        ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
+        header('HTTP/1.1 404 Not Found');
+        die();
+    }
+
+    ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
+    header("Content-type: image/" . ($ext == "png" ? "png" : "jpeg"));
+    if ($no_cache)
+        header("Cache-Control: must-revalidate"); // Bewirkt, dass der Browser jedesmal die Datei neu prüft
+    else
+        header("Cache-Control: max-age=2592000");  // Bewirkt, dass nach dreißig Tagen die Datei vom Browser auf eine Aktualisierung geprüft wird.
+    header("Last-Modified: " . $last_modified);
+    header('ETag: "' . $etag . '"');
+
+    $width = imagesx($image);
+    $height = imagesy($image);
+
+    if (($fixed_width == 0 || $width == $fixed_width) && ($fixed_height == 0 || $height == $fixed_height) && ($fixed_width != 0 || $max_width == 0 || $width <= $max_width) && ($fixed_height != 0 || $max_height == 0 || $height <= $max_height)) {
+        if ($ext == "png") {
+            imagesavealpha($image, true);
+            imagepng($image);
+        } else
+            imagejpeg($image);
+        die();
+    }
+
+    $new_width = $width;
+    $new_height = $height;
+
+    if ($max_height > 0 && $new_height > $max_height) {
+        $new_width = max(round($new_width * $max_height / $new_height), 1);
+        $new_height = $max_height;
+    }
+    if ($max_width > 0 && $new_width > $max_width) {
+        $new_height = max(round($new_height * $max_width / $new_width), 1);
+        $new_width = $max_width;
+    }
+
+    if ($max_width > 0 && (($max_width - $new_width) % 2) == 1)  // Toleranz bei nur 1 Pixel Unterschied
+        $new_width += 1;
+    if ($max_height > 0 && (($max_height - $new_height) % 2) == 1)  // Toleranz bei nur 1 Pixel Unterschied
+        $new_height += 1;
+
+    $image_resized = imagecreatetruecolor(max($fixed_width, $new_width), max($fixed_height, $new_height));
+    $color = $ext == "png" ? imagecolorallocatealpha($image_resized, 0, 0, 0, 127) : imagecolorallocate($image_resized, 64, 64, 64);
+    imagefill($image_resized, 0, 0, $color);
+    imagecopyresampled($image_resized, $image, round((imagesx($image_resized) - $new_width) / 2), round((imagesy($image_resized) - $new_height) / 2), 0, 0, $new_width, $new_height, $width, $height);
+    if ($ext == "png") {
+        imagesavealpha($image_resized, true);
+        imagepng($image_resized);
+    } else
+        imagejpeg($image_resized);
+    die();
+}
+
+function bildLoeschen($typ, $id): void
+{
+    $typ_exploded = explode("/", $typ);
+    $typ          = $typ_exploded[0];
+    $typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
+    $bilder_pfad  = SPORTSMANAGER_JOOMLA_PATH . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ;
+    $pfad         = $bilder_pfad . '/' . $typ_prefix . $id . ".";
+    if (!is_file($pfad . 'png') && !is_file($pfad . 'jpg'))
+        return;
+    $alte_bilder = Folder::files($bilder_pfad, '^' . $typ_prefix . $id . '\.|^' . $typ_prefix . 'I' . $id . 'T');
+    foreach ($alte_bilder as $fn)
+        File::delete($bilder_pfad . DIRECTORY_SEPARATOR . $fn);
+}
+
+function bildIdentisch($typ1, $id1, $typ2, $id2): bool
+{
+    $typ1_exploded = explode("/", $typ1);
+    $typ1          = $typ1_exploded[0];
+    $typ1_prefix   = count($typ1_exploded) > 1 ? $typ1_exploded[1] : "";
+    $bilder_pfad1  = SPORTSMANAGER_JOOMLA_PATH . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ1;
+    $pfad1         = $bilder_pfad1 . '/' . $typ1_prefix . $id1 . ".";
+    if (is_file($pfad1 . "png"))
+        $ext = "png";
+    else if (is_file($pfad1 . "jpg"))
+        $ext = "jpg";
+    else
+        $ext = "";
+    $pfad1 .= $ext;
+
+    $typ2_exploded = explode("/", $typ2);
+    $typ2          = $typ2_exploded[0];
+    $typ2_prefix   = count($typ2_exploded) > 1 ? $typ2_exploded[1] : "";
+    $bilder_pfad2  = SPORTSMANAGER_JOOMLA_PATH . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ2;
+    $pfad2         = $bilder_pfad2 . '/' . $typ2_prefix . $id2 . "." . $ext;
+
+    return files_identical($pfad1, $pfad2);
+}
+
+function teamImage($teamId, $vereinId, $width = 240, $height = 240): ?string
+{
+    $url = bildURL("mannschaften", $teamId, 0, 0, $width, $height);
+
+    if ($url == null) {
+        $url = bildURL("vereine", $vereinId, 0, 0, $width, $height);
+    }
+
+    return $url;
+}
+
+function playerImage($playerId, $gender, $width = 180, $height = 240): ?string
+{
+    $url = bildURL("spieler", $playerId, $width, $height, 0,0, $gender == 'M' ? 'm' : 'w');
+    if ($url == null) {
+        $url = bildURL("mannschaftsmitglieder", $playerId, $width, $height);
+    }
+
+    return $url;
+}
+
+#[NoReturn] function spielerbild(): void
+{
+    $db = getDatabase();
+    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+
+    $spielernr = $db->escape(trim($jInput->get('spielernr', '', 'RAW')));
+    $lizenznr = $db->escape(trim($jInput->get('lizenznr', '', 'RAW')));
+
+    if (empty($spielernr) && empty($lizenznr)) {
+        ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
+        header('HTTP/1.1 404 Not Found');
+        die();
+    }
+
+    $query = "SELECT spieler_id"
+        . "\n FROM #__sportsmanager_spieler"
+        . "\n WHERE NOT ISNULL(aktueller_verein_id) AND NOT bild_ausblenden" . (!empty($spielernr) ? " AND spielernr = '$spielernr'" : " AND lizenznr = '$lizenznr'")
+        . "\n ORDER BY spieler_id DESC";
+    $rows = loadObjectList($db, $query);
+    if (count($rows) < 1) {
+        ob_end_clean(); // Wegen UTF-8-Zeichen, die in der ausgabe vorhanden sind
+        header('HTTP/1.1 404 Not Found');
+        die();
+    }
+
+    $id = $rows[0]->spieler_id;
+    bildAnpassen("spieler", $id);
+}
+
+function bildURL($typ, $id, $fixed_width = 0, $fixed_height = 0, $max_width = 0, $max_height = 0, $alternativ = ""): ?string
+{
+    $typ_exploded = explode("/", $typ);
+    $typ          = $typ_exploded[0];
+    $typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
+
+    $pfad = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
+    if (is_file($pfad . "png"))
+        $ext = "png";
+    else if (is_file($pfad . "jpg"))
+        $ext = "jpg";
+    else if (!empty($alternativ)) {
+        $id   = $alternativ;
+        $pfad = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
+        if (is_file($pfad . "png"))
+            $ext = "png";
+        else if (is_file($pfad . "jpg"))
+            $ext = "jpg";
+        else
+            return null;
+    }
+    else
+        return null;
+
+    $time = filemtime($pfad . $ext);
+
+    if ($fixed_width > 0 && $fixed_height > 0) {
+        $pfad_angepasst = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $fixed_width . "H" . $fixed_height . "." . $ext;
+        if (is_file($pfad_angepasst)) {
+            return  SPORTSMANAGER_JOOMLA_URL . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst);
+        }
+    }
+
+    $size   = getimagesize($pfad . $ext);
+    $width  = $size[0];
+    $height = $size[1];
+
+    $max_width  = $fixed_width > 0 ? $fixed_width : $max_width;
+    $max_height = $fixed_height > 0 ? $fixed_height : $max_height;
+
+    if (($fixed_width == 0 || $width == $fixed_width) && ($fixed_height == 0 || $height == $fixed_height) && ($fixed_width != 0 || $max_width == 0 || $width <= $max_width) && ($fixed_height != 0 || $max_height == 0 || $height <= $max_height)) {
+        $pfad_angepasst = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $width . "H" . $height . "." . $ext;
+        if (!is_file($pfad_angepasst)) {
+            if (!copy($pfad . $ext, $pfad_angepasst))
+                return null;
+        }
+
+        return SPORTSMANAGER_JOOMLA_URL . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst);
+    }
+
+    $new_width  = $width;
+    $new_height = $height;
+
+    if ($max_height > 0 && $new_height > $max_height) {
+        $new_width  = max(round($new_width * $max_height / $new_height), 1);
+        $new_height = $max_height;
+    }
+    if ($max_width > 0 && $new_width > $max_width) {
+        $new_height = max(round($new_height * $max_width / $new_width), 1);
+        $new_width  = $max_width;
+    }
+
+    if ($max_width > 0 && (($max_width - $new_width) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
+        $new_width += 1;
+    if ($max_height > 0 && (($max_height - $new_height) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
+        $new_height += 1;
+
+    $pfad_angepasst = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . max($fixed_width, $new_width) . "H" . max($fixed_height, $new_height) . "." . $ext;
+
+    if (!is_file($pfad_angepasst)) {
+        $image = $ext == "png" ? imagecreatefrompng($pfad . $ext) : imagecreatefromjpeg($pfad . $ext);
+        if ($image === false)
+            return null;
+
+        $image_resized = imagecreatetruecolor(max($fixed_width, $new_width), max($fixed_height, $new_height));
+        $color         = $ext == "png" ? imagecolorallocatealpha($image_resized, 0, 0, 0, 127) : imagecolorallocate($image_resized, 64, 64, 64);
+        imagefill($image_resized, 0, 0, $color);
+        imagecopyresampled($image_resized, $image, round((imagesx($image_resized) - $new_width) / 2), round((imagesy($image_resized) - $new_height) / 2), 0, 0, $new_width, $new_height, $width, $height);
+        if ($ext == "png") {
+            imagesavealpha($image_resized, true);
+            imagepng($image_resized, $pfad_angepasst);
+        }
+        else
+            imagejpeg($image_resized, $pfad_angepasst);
+    }
+
+    return SPORTSMANAGER_JOOMLA_URL . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst);
+}
+
+/*
+ * #resize=250
+#resize=250,250,blue
+#resize=250,250,blue
+#resize=250,250&sizes=60%,80%,200%
+#resize=250,250,cover&sizes=60%,80%,200%
+#resize=250,250,fill&sizes=60%,80%,200%
+#crop=250,250,center,top
+#crop=250,250
+#crop=250,250,center,bottom
+#crop=250,250,left
+#crop=250,250,right
+ */
+function yoothemeBild($typ, $id, $alternativ, $zusatz = ""): ?string
+{
+    $typ_exploded = explode("/", $typ);
+    $typ          = $typ_exploded[0];
+    $typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
+    $pfad = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
+
+    if (is_file($pfad . "png"))
+        $ext = "png";
+    else if (is_file($pfad . "jpg"))
+        $ext = "jpg";
+    else if (!empty($alternativ)) {
+        $id   = $alternativ;
+        $pfad = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
+        if (is_file($pfad . "png"))
+            $ext = "png";
+        else if (is_file($pfad . "jpg"))
+            $ext = "jpg";
+        else
+            return null;
+    }
+    else
+        return null;
+
+    $bildpfad =  SPORTSMANAGER_JOOMLA_URL . "images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . "." . $ext;
+
+    return '<img  class="el-image" data-src="' . $bildpfad . '" ' . $zusatz . ' uk-img />';
+}
+
+function bildHTML($typ, $id, $fixed_width = 0, $fixed_height = 0, $max_width = 0, $max_height = 0, $zusatz = "", $alternativ = ""): ?string
+{
+    $typ_exploded = explode("/", $typ);
+    $typ          = $typ_exploded[0];
+    $typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
+
+    $pfad = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
+    if (is_file($pfad . "png"))
+        $ext = "png";
+    else if (is_file($pfad . "jpg"))
+        $ext = "jpg";
+    else if (!empty($alternativ)) {
+        $id   = $alternativ;
+        $pfad = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
+        if (is_file($pfad . "png"))
+            $ext = "png";
+        else if (is_file($pfad . "jpg"))
+            $ext = "jpg";
+        else
+            return null;
+    }
+    else
+        return null;
+
+    $time = filemtime($pfad . $ext);
+
+    if ($fixed_width > 0 && $fixed_height > 0) {
+        $pfad_angepasst = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $fixed_width . "H" . $fixed_height . "." . $ext;
+        if (is_file($pfad_angepasst)) {
+            return '<img src="' . SPORTSMANAGER_JOOMLA_URL . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst) . '" width="' . $fixed_width . '" height="' . $fixed_height . '" ' . $zusatz . ' />';
+        }
+    }
+
+    $size   = getimagesize($pfad . $ext);
+    $width  = $size[0];
+    $height = $size[1];
+
+    $max_width  = $fixed_width > 0 ? $fixed_width : $max_width;
+    $max_height = $fixed_height > 0 ? $fixed_height : $max_height;
+
+    if (($fixed_width == 0 || $width == $fixed_width) && ($fixed_height == 0 || $height == $fixed_height) && ($fixed_width != 0 || $max_width == 0 || $width <= $max_width) && ($fixed_height != 0 || $max_height == 0 || $height <= $max_height)) {
+        $pfad_angepasst = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $width . "H" . $height . "." . $ext;
+        if (!is_file($pfad_angepasst)) {
+            if (!copy($pfad . $ext, $pfad_angepasst))
+                return null;
+        }
+
+        return '<img src="' . SPORTSMANAGER_JOOMLA_URL . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst) . '" width="' . $width . '" height="' . $height . '" ' . $zusatz . ' />';
+    }
+
+    $new_width  = $width;
+    $new_height = $height;
+
+    if ($max_height > 0 && $new_height > $max_height) {
+        $new_width  = max(round($new_width * $max_height / $new_height), 1);
+        $new_height = $max_height;
+    }
+    if ($max_width > 0 && $new_width > $max_width) {
+        $new_height = max(round($new_height * $max_width / $new_width), 1);
+        $new_width  = $max_width;
+    }
+
+    if ($max_width > 0 && (($max_width - $new_width) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
+        $new_width += 1;
+    if ($max_height > 0 && (($max_height - $new_height) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
+        $new_height += 1;
+
+    $pfad_angepasst = SPORTSMANAGER_JOOMLA_PATH . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . max($fixed_width, $new_width) . "H" . max($fixed_height, $new_height) . "." . $ext;
+
+    if (!is_file($pfad_angepasst)) {
+        $image = $ext == "png" ? imagecreatefrompng($pfad . $ext) : imagecreatefromjpeg($pfad . $ext);
+        if ($image === false)
+            return null;
+
+        $image_resized = imagecreatetruecolor(max($fixed_width, $new_width), max($fixed_height, $new_height));
+        $color         = $ext == "png" ? imagecolorallocatealpha($image_resized, 0, 0, 0, 127) : imagecolorallocate($image_resized, 64, 64, 64);
+        imagefill($image_resized, 0, 0, $color);
+        imagecopyresampled($image_resized, $image, round((imagesx($image_resized) - $new_width) / 2), round((imagesy($image_resized) - $new_height) / 2), 0, 0, $new_width, $new_height, $width, $height);
+        if ($ext == "png") {
+            imagesavealpha($image_resized, true);
+            imagepng($image_resized, $pfad_angepasst);
+        }
+        else
+            imagejpeg($image_resized, $pfad_angepasst);
+    }
+
+    return '<img src="' . SPORTSMANAGER_JOOMLA_URL . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst) . '" width="' . max($fixed_width, $new_width) . '" height="' . max($fixed_height, $new_height) . '" ' . $zusatz . ' />';
+}

src/structure/components/com_sportsmanager/util/version.php

@@ -0,0 +1,6 @@
+<?php // do not change this file, this is automatically updated while building releases, see .github/workflows/build_release.yml
+defined('_JEXEC') or die;
+return [
+    'version' => 'DEV',
+    'date' => '2025-08-05',
+];

src/structure/components/com_sportsmanager/views/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/components/com_sportsmanager/views/sportsmanager/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/components/com_sportsmanager/views/sportsmanager/tmpl/default.xml

@@ -24,6 +24,9 @@
       <option value="vereine"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_CLUBS]]></option>
       <option value="spielorte"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_VENUES]]></option>
       <option value="termine"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_APPOINTMENTS]]></option>
+	  <option value="spielverlegungen"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_MATCH_RESCHEDULING]]></option>
+	  <option value="verbandsorgane"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_ASSOCIATION_BODIES]]></option>
+	  <option value="hall_of_fame"><![CDATA[COM_SPORTSMANAGER_LAYOUT_GENERAL_CONTENT_OPTION_HALL_OF_FAME]]></option>
       </field>
       <field name="titel"
             type="text"

src/structure/components/com_sportsmanager/views/sportsmanager/tmpl/desktop.ini

@@ -1,5 +0,0 @@
-[.ShellClassInfo]
-InfoTip=Dieser Ordner wird online freigegeben.
-IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
-IconIndex=16
-    

src/structure/components/com_sportsmanager/views/sportsmanager/view.json.php

@@ -1,12 +1,18 @@
 <?php
+
+use JetBrains\PhpStorm\NoReturn;
+
 defined('_JEXEC') or die('Restricted access');
 
-require_once(JPATH_COMPONENT . DIRECTORY_SEPARATOR . 'views/sportsmanager/view_tools.php');
+require_once JPATH_SITE . '/components/com_sportsmanager/views/sportsmanager/view_tools.php';
+require_once JPATH_SITE . '/components/com_sportsmanager/util/image.php';
 
 
-class JSON_sportsmanager {
+class JSON_sportsmanager
+{
 
-	static function mannschaften($veranstaltung, $rows) {
+    static function mannschaften($veranstaltung, $rows): array
+    {
         $teams = [];
         foreach ($rows as $team) {
             $team->teambild = teamImage($team->team_id, $team->verein_id);
@@ -22,7 +28,8 @@ class JSON_sportsmanager {
         ];
     }
 
-	static function tabelleAnzeigen($veranstaltung, $modus, $teams, $spieltag, $spieltage, $alleine_angezeigt, $praesentation) {
+    static function tabelleAnzeigen($modus, $teams): array
+    {
         foreach ($teams as $team) {
             $team->teambild = teamImage($team->team_id, $team->verein_id);
         }
@@ -33,8 +40,9 @@ class JSON_sportsmanager {
         ];
     }
 
-	static function tabelleEigeneAnzeigen($veranstaltung, $modus, $teams, $alleine_angezeigt, $praesentation) {
+    static function tabelleEigeneAnzeigen($modus, $teams): array
-	    foreach($teams as $team) {
+    {
+        foreach ($teams as $team) {
             $team->teambild = teamImage($team->team_id, $team->verein_id);
         }
         return [
@@ -43,7 +51,8 @@ class JSON_sportsmanager {
         ];
     }
 
-	static function _getPlayerDetails($game, $home_player_map, $away_player_map) {
+    static function _getPlayerDetails($game, $home_player_map, $away_player_map): void
+    {
         // TODO dynamisch machen
         $game->heim_spieler_1_vorname = isset($home_player_map[$game->heim_spieler_1_id])
             ? $home_player_map[$game->heim_spieler_1_id]->vorname
@@ -87,7 +96,8 @@ class JSON_sportsmanager {
 
     }
 
-	static function adminEditBegegnungSpielplan($bestaetigen, $veranstaltung, $begegnung, $heim_team, $gast_team, $spiele, $heim_spieler, $gast_spieler, $teamspiel_modus, $encrypted_pin, $count_verlegen_aktionen, $erneut_oeffnen, $aus_uebersicht) {
+    static function adminEditBegegnungSpielplan($bestaetigen, $veranstaltung, $begegnung, $heim_team, $gast_team, $spiele, $heim_spieler, $gast_spieler, $teamspiel_modus): array
+    {
         $heim_team->teambild = teamImage($heim_team->team_id, $heim_team->verein_id);
         $gast_team->teambild = teamImage($gast_team->team_id, $gast_team->verein_id);
         $heim_spieler_map = [];
@@ -119,7 +129,8 @@ class JSON_sportsmanager {
         ];
     }
 
-	static function mannschaftDetails($veranstaltung, $team, $mitglieder, $mailverteiler, $mitglieder_statistiken, $teamansprechpartner, $begegnungen, $vorheriges_team_id, $naechstes_team_id, $team_moderator, $details_anzeigen, $ansprechpartner_anzeigen, $weitere_veranstaltungen, $veranstaltungsbezeichnungen, $spielberechtigungen, $ansicht_vereinigt, $ist_vergangen) {
+    static function mannschaftDetails($veranstaltung, $team, $mitglieder, $teamansprechpartner, $begegnungen, $ansprechpartner_anzeigen, $veranstaltungsbezeichnungen): array
+    {
         global $sportsmanager_joomla_path;
         global $sportsmanager_joomla_url;
 
@@ -156,25 +167,27 @@ class JSON_sportsmanager {
         ];
     }
 
-	static function JSON($data, $meta = NULL) {
+    #[NoReturn] static function JSON($data, $meta = NULL): void
+    {
         $response = [
             'data' => $data
         ];
         if ($meta != NULL) {
             $response['meta'] = $meta;
         }
-		header('Content-Type: application/json; charset=utf-8', true);
+        header('Content-Type: application/json; charset=utf-8');
         echo json_encode($response);
         jexit();
     }
 
-	static function spielerstatistik($spielerstatistik, $spielerstatistik_punkte, $allein_angezeigt, $filter_saison_id, $vorherige_spielerstatistik_id, $naechste_spielerstatistik_id, $details_anzeigen) {
+    #[NoReturn] static function spielerstatistik($spielerstatistik_punkte): void
+    {
         $rank = 1;
         foreach ($spielerstatistik_punkte as $s) {
             $s->spieler_bild = playerImage($s->spieler_id, $s->geschlecht);
-			$s->spieler_2_bild= playerImage($s->spieler_2_id, $s->geschlecht_2);
+            $s->spieler_2_bild = playerImage($s->spieler_2_id, $s->geschlecht_2);
             $s->quote = ($s->spielpunkte_gewonnen > 0 || $s->spielpunkte_verloren > 0)
-				? round($s->spielpunkte_gewonnen * 100 / ($s->spielpunkte_gewonnen + $s->spielpunkte_verloren), 0) . '%'
+                ? round($s->spielpunkte_gewonnen * 100 / ($s->spielpunkte_gewonnen + $s->spielpunkte_verloren)) . '%'
                 : '-';
             $s->rank = '' . $rank;
             $rank++;
@@ -182,23 +195,25 @@ class JSON_sportsmanager {
         self::JSON($spielerstatistik_punkte);
     }
 
-	static function spielerDetails($spieler, $vereine, $veranstalter, $spieler_elo_verlauf_einzel, $spieler_elo_verlauf_doppel, $spielerNamen, $teamNamen, $veranstaltungBezeichnungen, $turnierdisziplinBezeichnungen, $individualwettbewerbBezeichnungen, $ranglistenplatzierungen, $turnierplatzierungen, $teams, $sortierung, $vorheriger_spieler_id, $naechster_spieler_id, $elo_detailliert, $statistik, $beginn, $kategorie, $einstufungen, $filter, $veranstaltungid, $veranstalterid, $einstufungid, $unabhaengige_ansicht, $details_anzeigen) {
+    #[NoReturn] static function spielerDetails($spieler, $vereine, $veranstalter, $spieler_elo_verlauf_einzel, $spieler_elo_verlauf_doppel, $spielerNamen, $teamNamen, $veranstaltungBezeichnungen, $turnierdisziplinBezeichnungen, $individualwettbewerbBezeichnungen, $ranglistenplatzierungen, $turnierplatzierungen, $teams, $elo_detailliert, $statistik, $einstufungen): void
+    {
+		if (count($vereine) == 0){die;}
         $letzte_einzel = [];
         $spieler->bild = playerImage($spieler->spieler_id, $spieler->geschlecht);
-	    for ($i = sizeof($spieler_elo_verlauf_einzel) - 1; $i >= max(sizeof($spieler_elo_verlauf_einzel)-10, 0); $i--) {
+        for ($i = sizeof($spieler_elo_verlauf_einzel) - 1; $i >= max(sizeof($spieler_elo_verlauf_einzel) - 10, 0); $i--) {
             $e = $spieler_elo_verlauf_einzel[$i];
             $letzte_einzel[] = [
                 'datum' => $e['z'],
                 'spieler_1' => isset($spielerNamen[$e['h1']]) ? [
                     'spieler_id' => $e['h1'],
                     'bild' => playerImage($e['h1'], 'M'),
-                    'vorname' => explode(', ',$spielerNamen[$e['h1']])[1],
+                    'vorname' => explode(', ', $spielerNamen[$e['h1']])[1],
-                    'nachname' => explode(', ',$spielerNamen[$e['h1']])[0],
+                    'nachname' => explode(', ', $spielerNamen[$e['h1']])[0],
                 ] : NULL,
                 'spieler_team' => isset($e['th']) ? [
                     'id' => $e['th'],
                     'name' => $teamNamen[$e['th']],
-                ]: NULL,
+                ] : NULL,
                 'gegner_1' => isset($spielerNamen[$e['g1']]) ? [
                     'spieler_id' => $e['g1'],
                     'bild' => playerImage($e['g1'], 'M'),
@@ -252,7 +267,7 @@ class JSON_sportsmanager {
                     'bild' => playerImage($d['g2'], 'M'),
                     'vorname' => explode(', ', $spielerNamen[$d['g2']])[1],
                     'nachname' => explode(', ', $spielerNamen[$d['g2']])[0],
-                ]: NULL,
+                ] : NULL,
                 'gegner_team' => isset($d['th']) && isset($d['tg']) ?
                     [
                         'id' => $d['tg'],
@@ -272,7 +287,7 @@ class JSON_sportsmanager {
             'spieler' => $spieler,
             'vereine' => $vereine,
             'teams' => $teams,
-            'veranstalter'=> $veranstalter,
+            'veranstalter' => $veranstalter,
             'ranglisten_platzierungen' => $ranglistenplatzierungen,
             'turnier_platzierungen' => $turnierplatzierungen,
             'statistik' => $statistik,
@@ -285,13 +300,14 @@ class JSON_sportsmanager {
         ]);
     }
 
-	static function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $verlegen_aktionen, $berechtigt_fuer_akzeptieren, $aus_uebersicht, $vorschlagendes_team_id) {
+    #[NoReturn] static function begegnungVerlegen($veranstaltung, $verlegen_aktionen, $berechtigt_fuer_akzeptieren, $vorschlagendes_team_id): void
+    {
         $letzte_aktionen = array();
         foreach ($verlegen_aktionen as $aktion) {
             if ($aktion->aktion == 1 || $aktion->aktion == 5 || $aktion == 10) {
                 break;
             }
-			array_push($letzte_aktionen, $aktion);
+            $letzte_aktionen[] = $aktion;
         }
         $termine = array();
         if (count($letzte_aktionen) > 0) {
@@ -300,7 +316,7 @@ class JSON_sportsmanager {
                 if ($aktion->eingetragen != $eingetragen || $aktion->aktion != 0 || $aktion->zeitpunkt == NULL) {
                     break;
                 }
-				array_push($termine, $aktion);
+                $termine[] = $aktion;
             }
         }
 
@@ -316,10 +332,10 @@ class JSON_sportsmanager {
         $anzahl_termine = $veranstaltung->termine_maximal == 0 ? 3 : $veranstaltung->termine_maximal;
 
         for ($termin = 1; $termin <= $anzahl_termine; $termin++) {
-			if (isset($termine[$termin-1])) {
+            if (isset($termine[$termin - 1])) {
                 $response[] = [
-					'begegnung_historie_id' => $termine[$termin-1]->begegnung_historie_id,
+                    'begegnung_historie_id' => $termine[$termin - 1]->begegnung_historie_id,
-					'zeitpunkt' => $termine[$termin-1]->zeitpunkt
+                    'zeitpunkt' => $termine[$termin - 1]->zeitpunkt
                 ];
             }
         }
@@ -328,7 +344,7 @@ class JSON_sportsmanager {
             'termine' => $response,
             'berechtigt_anfordern' => $berechtigt_anfordern,
             'berechtigt_ablehnen' => $berechtigt_ablehnen,
-			'berechtigt_akzeptieren' => $berechtigt_fuer_akzeptieren ? TRUE : FALSE,
+            'berechtigt_akzeptieren' => (bool)$berechtigt_fuer_akzeptieren,
             'termine_minimal' => $veranstaltung->termine_minimal,
             'termine_maximal' => $veranstaltung->termine_maximal,
         ]);

src/structure/components/com_sportsmanager/views/sportsmanager/view_tools.php

@@ -3,29 +3,32 @@
  * Sports Manager (C) 2006-2020, Sven Nickel
  */
 
-// kein direkter Zugriff
+use Joomla\Filesystem\Folder;
-defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 
-function htmlentities_utf8($s) {
+// kein direkter Zugriff
+defined("_JEXEC") or die("Restricted access");
+
+function htmlentities_utf8($s): string
+{
 	return htmlentities($s, ENT_QUOTES, "UTF-8");
 }
 
-function htmlentities_noquotes_utf8($s) {
+function addOnLoad($function): void
-	return htmlentities($s, ENT_NOQUOTES, "UTF-8");
+{
-}
-
-function addOnLoad($function) {
 	?>
     <script language="JavaScript">
       function addLoadEvent(func) {
-        var oldonload = window.onload;
+          const oldOnload = window.onload;
           if (typeof window.onload != 'function') {
           window.onload = func;
         }
         else {
           window.onload = function () {
-            if (oldonload) {
+            if (oldOnload) {
-              oldonload();
+              oldOnload();
             }
             func();
           }
@@ -37,57 +40,87 @@ function addOnLoad($function) {
 	<?php
 }
 
-function SportsManagerURL($weitereParameter = null, $ssl = 0) {
+function SportsManagerURL($weitereParameter = "", $ssl = 0): ?string
-	return JRoute::_('index.php' . ($weitereParameter != null ? ("?" . ltrim($weitereParameter, "&")) : ""), false, $ssl);
+{
+    $urlPath = handleFilter($weitereParameter);
+    $joomlaBaseUrl = Uri::getInstance()->toString([
+        "scheme",
+        "host",
+        "port",
+        "path",
+    ]);
+
+    if (str_contains($joomlaBaseUrl, "?")) {
+        // Base URL already contains a query string, append with '&'
+        $finalUrl = $joomlaBaseUrl . "&" . ltrim($urlPath, "&");
+    } else {
+        // Base URL does not contain a query string, append with '?'
+        $finalUrl = $joomlaBaseUrl . "?" . ltrim($urlPath, "&");
+    }
+
+    return Route::_($finalUrl, false, $ssl);
 }
 
-function NichtLeererString($s, $ersatz = "Keiner") {
+function handleFilter($urlPart)
+{
+    // Check if both '&filter=' and '#' are present in the URL part
+    if (
+        str_contains($urlPart, "&filter=") &&
+        str_contains($urlPart, "#")
+    ) {
+        // Split the string by '#' to remove the hash part
+        $parts = explode("#", $urlPart, 2);
+        $query = $parts[0];
+
+        // Parse the query string into an associative array
+        parse_str($query, $queryParams);
+
+        // Remove the 'filter' parameter if it exists
+        unset($queryParams["filter"]);
+
+        // Rebuild the query string without the 'filter' parameter
+        return http_build_query($queryParams);
+    } else {
+        // Return the original URL part if either '&filter=' or '#' is not present
+        return $urlPart;
+    }
+}
+
+function NichtLeererString($s, $ersatz = "Keiner")
+{
 	return !empty($s) ? $s : $ersatz;
 }
 
 function hervorheben($titel) {
-	if (empty($titel))
+	if (empty($titel)) {
 		return $titel;
+	}
 
-	return $titel . ' *';
+	return $titel . " *";
 }
 
-function Laenderkennungen() {
+function Laenderkennungen(): array
-	$kennungen = array("AUT", "BEL", "BUL", "CZE", "DEN", "FRA", "GBR", "GER", "LUX", "NED", "SUI", "USA");
+{
-
+    return array("AUT", "BEL", "BUL", "CZE", "DEN", "FRA", "GBR", "GER", "LUX", "NED", "SUI", "USA");
-	return $kennungen;
 }
 
-function rundenstufe($stufe) {
+function rundenstufe($stufe): string
-	switch ($stufe) {
+{
-		case 0:
+	return match ($stufe) {
-			$bezeichnung = JText::_('COM_SPORTSMANAGER_FINAL_RANKS');
+        0 => Text::_("COM_SPORTSMANAGER_FINAL_RANKS"),
-			break;
+        1 => Text::_("COM_SPORTSMANAGER_MAIN_ROUND"),
-		case 1:
+        2 => Text::_("COM_SPORTSMANAGER_ADDITIONAL_ROUND"),
-			$bezeichnung = JText::_('COM_SPORTSMANAGER_MAIN_ROUND');
+        3 => Text::_("COM_SPORTSMANAGER_2ND_ADDITIONAL_ROUND"),
-			break;
+        10 => Text::_("COM_SPORTSMANAGER_PRELIMINARY_ROUND"),
-		case 2:
+        20 => Text::_("COM_SPORTSMANAGER_REGISTRATIONS"),
-			$bezeichnung = JText::_('COM_SPORTSMANAGER_ADDITIONAL_ROUND');
+        default => "",
-			break;
+    };
-		case 3:
-			$bezeichnung = JText::_('COM_SPORTSMANAGER_2ND_ADDITIONAL_ROUND');
-			break;
-		case 10:
-			$bezeichnung = JText::_('COM_SPORTSMANAGER_PRELIMINARY_ROUND');
-			break;
-		case 20:
-			$bezeichnung = JText::_('COM_SPORTSMANAGER_REGISTRATIONS');
-			break;
-		default:
-			$bezeichnung = "";
-	} // switch
-
-	return $bezeichnung;
 }
 
 function StringsZusammenfassen($titel1, $titel2, $ersatz = null, $separator = " / ") {
-	if ($ersatz == null)
+	if ($ersatz == null) {
-		$ersatz = JText::_('COM_SPORTSMANAGER_NONE');
+		$ersatz = Text::_("COM_SPORTSMANAGER_NONE");
+	}
 	$t1 = NichtLeererString($titel1, $ersatz);
 	$t2 = NichtLeererString($titel2, $ersatz);
 
@@ -97,65 +130,59 @@ function StringsZusammenfassen($titel1, $titel2, $ersatz = null, $separator = "
 function Rundenbezeichnung($runde, $spieltag = false, $bezeichnung_verstecken = false, $kurzform = false) {
 	if ($kurzform) {
 		if ($runde >= 20000)
-			return JText::sprintf('COM_SPORTSMANAGER_PLACE_FROM_TO_SHORTCUT', 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
+			return Text::sprintf("COM_SPORTSMANAGER_PLACE_FROM_TO_SHORTCUT", 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
 
-		switch ($runde) {
+        return match ($runde) {
-			case 0:
+            0 => $spieltag
-				return $spieltag ? JText::_('COM_SPORTSMANAGER_MATCH_DAY_NONE') : JText::_('COM_SPORTSMANAGER_ROUND_NONE');
+                ? Text::_("COM_SPORTSMANAGER_MATCH_DAY_NONE")
-			case 19999:
+                : Text::_("COM_SPORTSMANAGER_ROUND_NONE"),
-				return JText::_('COM_SPORTSMANAGER_FINAL_SHORTCUT');
+            19999 => Text::_("COM_SPORTSMANAGER_FINAL_SHORTCUT"),
-			case 19998:
+            19998 => Text::_("COM_SPORTSMANAGER_3RD_PLACE_SHORTCUT"),
-				return JText::_('COM_SPORTSMANAGER_3RD_PLACE_SHORTCUT');
+            19997 => Text::_("COM_SPORTSMANAGER_HALF_FINAL_SHORTCUT"),
-			case 19997:
+            19996 => Text::_("COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT"),
-				return JText::_('COM_SPORTSMANAGER_HALF_FINAL_SHORTCUT');
+            19995 => Text::_("COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT"),
-			case 19996:
+            19994 => Text::_("COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT"),
-				return JText::_('COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT');
+            19993 => Text::_("COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT"),
-			case 19995:
+            19992 => Text::_("COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT"),
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT');
+            default => $bezeichnung_verstecken ? $runde : Text::sprintf($spieltag ? "COM_SPORTSMANAGER_MATCH_DAY_NR_SHORTCUT" : "COM_SPORTSMANAGER_ROUND_NR_SHORTCUT", $runde),
-			case 19994:
+        };
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT');
-			case 19993:
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT');
-			case 19992:
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT');
-		}
 
-		return $bezeichnung_verstecken ? $runde : JText::sprintf($spieltag ? 'COM_SPORTSMANAGER_MATCH_DAY_NR_SHORTCUT' : 'COM_SPORTSMANAGER_ROUND_NR_SHORTCUT', $runde);
     }
 	else {
 		if ($runde >= 20000)
-			return JText::sprintf('COM_SPORTSMANAGER_PLACE_FROM_TO', 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
+			return Text::sprintf("COM_SPORTSMANAGER_PLACE_FROM_TO", 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
 
-		switch ($runde) {
+        return match ($runde) {
-			case 0:
+            0 => $spieltag
-				return $spieltag ? JText::_('COM_SPORTSMANAGER_MATCH_DAY_NONE') : JText::_('COM_SPORTSMANAGER_ROUND_NONE');
+                ? Text::_("COM_SPORTSMANAGER_MATCH_DAY_NONE")
-			case 19999:
+                : Text::_("COM_SPORTSMANAGER_ROUND_NONE"),
-				return JText::_('COM_SPORTSMANAGER_FINAL');
+            19999 => Text::_("COM_SPORTSMANAGER_FINAL"),
-			case 19998:
+            19998 => Text::_("COM_SPORTSMANAGER_3RD_PLACE"),
-				return JText::_('COM_SPORTSMANAGER_3RD_PLACE');
+            19997 => Text::_("COM_SPORTSMANAGER_HALF_FINAL"),
-			case 19997:
+            19996 => Text::_("COM_SPORTSMANAGER_QUARTER_FINAL"),
-				return JText::_('COM_SPORTSMANAGER_HALF_FINAL');
+            19995 => Text::_("COM_SPORTSMANAGER_ROUND_OF_16"),
-			case 19996:
+            19994 => Text::_("COM_SPORTSMANAGER_ROUND_OF_32"),
-				return JText::_('COM_SPORTSMANAGER_QUARTER_FINAL');
+            19993 => Text::_("COM_SPORTSMANAGER_ROUND_OF_64"),
-			case 19995:
+            19992 => Text::_("COM_SPORTSMANAGER_ROUND_OF_128"),
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_16');
+            default => $bezeichnung_verstecken
-			case 19994:
+                ? $runde
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_32');
+                : Text::sprintf(
-			case 19993:
+                    $spieltag
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_64');
+                        ? "COM_SPORTSMANAGER_MATCH_DAY_NR"
-			case 19992:
+                        : "COM_SPORTSMANAGER_ROUND_NR",
-				return JText::_('COM_SPORTSMANAGER_ROUND_OF_128');
+                    $runde
-		}
+                ),
+        };
 
-		return $bezeichnung_verstecken ? $runde : JText::sprintf($spieltag ? 'COM_SPORTSMANAGER_MATCH_DAY_NR' : 'COM_SPORTSMANAGER_ROUND_NR', $runde);
     }
 }
 
-function FormatiertesDatum($s, $zeit_anzeigen = true, $wochentag_anzeigen = true) {
+function FormatiertesDatum($s, $zeit_anzeigen = true, $wochentag_anzeigen = true): string
+{
 	if ($s != null && strlen($s) > 0) {
 		$ts = getdate(strtotime($s));
 		if ($wochentag_anzeigen) {
-			$wochentage = array(JText::_('COM_SPORTSMANAGER_DAY_0_SHORTCUT'), JText::_('COM_SPORTSMANAGER_DAY_1_SHORTCUT'), JText::_('COM_SPORTSMANAGER_DAY_2_SHORTCUT'), JText::_('COM_SPORTSMANAGER_DAY_3_SHORTCUT'), JText::_('COM_SPORTSMANAGER_DAY_4_SHORTCUT'), JText::_('COM_SPORTSMANAGER_DAY_5_SHORTCUT'), JText::_('COM_SPORTSMANAGER_DAY_6_SHORTCUT'));
+			$wochentage = array(Text::_("COM_SPORTSMANAGER_DAY_0_SHORTCUT"), Text::_("COM_SPORTSMANAGER_DAY_1_SHORTCUT"), Text::_("COM_SPORTSMANAGER_DAY_2_SHORTCUT"), Text::_("COM_SPORTSMANAGER_DAY_3_SHORTCUT"), Text::_("COM_SPORTSMANAGER_DAY_4_SHORTCUT"), Text::_("COM_SPORTSMANAGER_DAY_5_SHORTCUT"), Text::_("COM_SPORTSMANAGER_DAY_6_SHORTCUT"));
 			if ($zeit_anzeigen)
 				return sprintf("%s, %02d.%02d.%04d %02d:%02d", $wochentage[$ts["wday"]], $ts["mday"], $ts["mon"], $ts["year"], $ts["hours"], $ts["minutes"]);
 
@@ -167,10 +194,11 @@ function FormatiertesDatum($s, $zeit_anzeigen = true, $wochentag_anzeigen = true
 		return sprintf("%02d.%02d.%04d", $ts["mday"], $ts["mon"], $ts["year"]);
 	}
 
-	return JText::_('COM_SPORTSMANAGER_DATE_NONE');
+	return Text::_("COM_SPORTSMANAGER_DATE_NONE");
 }
 
-function FormatierterTermin($erster_tag, $letzter_tag, $jahr_anzeigen = false, $filter_jahr = null) {
+function FormatierterTermin($erster_tag, $letzter_tag, $jahr_anzeigen = false, $filter_jahr = null): string
+{
 	$erster_ts  = getdate(strtotime($erster_tag));
 	$letzter_ts = getdate(strtotime($letzter_tag));
 	if (!empty($filter_jahr))
@@ -188,401 +216,12 @@ function FormatierterTermin($erster_tag, $letzter_tag, $jahr_anzeigen = false, $
 	return $erster_termin . "-" . $letzter_termin;
 }
 
-function bildLoeschen($typ, $id) {
+function terminDokumentname($id): bool|string
-	global $sportsmanager_joomla_path;
-	$typ_exploded = explode("/", $typ);
-	$typ          = $typ_exploded[0];
-	$typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
-	$bilder_pfad  = $sportsmanager_joomla_path . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ;
-	$pfad         = $bilder_pfad . '/' . $typ_prefix . $id . ".";
-	if (!is_file($pfad . 'png') && !is_file($pfad . 'jpg'))
-		return;
-	$alte_bilder = JFolder::files($bilder_pfad, '^' . $typ_prefix . $id . '\.|^' . $typ_prefix . 'I' . $id . 'T');
-	foreach ($alte_bilder as $fn)
-		JFile::delete($bilder_pfad . DIRECTORY_SEPARATOR . $fn);
-}
-
-function bildIdentisch($typ1, $id1, $typ2, $id2) {
-	global $sportsmanager_joomla_path;
-	$typ1_exploded = explode("/", $typ1);
-	$typ1          = $typ1_exploded[0];
-	$typ1_prefix   = count($typ1_exploded) > 1 ? $typ1_exploded[1] : "";
-	$bilder_pfad1  = $sportsmanager_joomla_path . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ1;
-	$pfad1         = $bilder_pfad1 . '/' . $typ1_prefix . $id1 . ".";
-	if (is_file($pfad1 . "png"))
-		$ext = "png";
-	else if (is_file($pfad1 . "jpg"))
-		$ext = "jpg";
-	else
-		$ext = "";
-	$pfad1 .= $ext;
-
-	$typ2_exploded = explode("/", $typ2);
-	$typ2          = $typ2_exploded[0];
-	$typ2_prefix   = count($typ2_exploded) > 1 ? $typ2_exploded[1] : "";
-	$bilder_pfad2  = $sportsmanager_joomla_path . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'sportsmanager' . DIRECTORY_SEPARATOR . $typ2;
-	$pfad2         = $bilder_pfad2 . '/' . $typ2_prefix . $id2 . "." . $ext;
-
-	return files_identical($pfad1, $pfad2);
-}
-
-function teamImage($teamId, $vereinId, $width = 240, $height = 240) {
-	$url = bildURL("mannschaften", $teamId, 0, 0, $width, $height);
-
-	if ($url == null) {
-		$url = bildURL("vereine", $vereinId, 0, 0, $width, $height);
-	}
-
-	return $url;
-}
-
-function playerImage($playerId, $gender, $width = 180, $height = 240) {
-	$url = bildURL("spieler", $playerId, $width, $height, 0,0,'', $gender == 'M' ? 'm' : 'w');
-	if ($url == null) {
-		$url = bildURL("mannschaftsmitglieder", $playerId, $width, $height, 0,0,'');
-	}
-
-	return $url;
-}
-
-
-function bildURL($typ, $id, $fixed_width = 0, $fixed_height = 0, $max_width = 0, $max_height = 0, $zusatz = "", $alternativ = "") {
-	global $sportsmanager_joomla_path;
-	global $sportsmanager_joomla_url;
-
-	$typ_exploded = explode("/", $typ);
-	$typ          = $typ_exploded[0];
-	$typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
-
-	$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-	if (is_file($pfad . "png"))
-		$ext = "png";
-	else if (is_file($pfad . "jpg"))
-		$ext = "jpg";
-	else if (!empty($alternativ)) {
-		$id   = $alternativ;
-		$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-		if (is_file($pfad . "png"))
-			$ext = "png";
-		else if (is_file($pfad . "jpg"))
-			$ext = "jpg";
-		else
-			return null;
-	}
-	else
-		return null;
-
-	$time = filemtime($pfad . $ext);
-
-	if ($fixed_width > 0 && $fixed_height > 0) {
-		$pfad_angepasst = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $fixed_width . "H" . $fixed_height . "." . $ext;
-		if (is_file($pfad_angepasst)) {
-			return  $sportsmanager_joomla_url . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst);
-		}
-	}
-
-	$size   = getimagesize($pfad . $ext);
-	$width  = $size[0];
-	$height = $size[1];
-
-	$max_width  = $fixed_width > 0 ? $fixed_width : $max_width;
-	$max_height = $fixed_height > 0 ? $fixed_height : $max_height;
-
-	if (($fixed_width == 0 || $width == $fixed_width) && ($fixed_height == 0 || $height == $fixed_height) && ($fixed_width != 0 || $max_width == 0 || $width <= $max_width) && ($fixed_height != 0 || $max_height == 0 || $height <= $max_height)) {
-		$pfad_angepasst = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $width . "H" . $height . "." . $ext;
-		if (!is_file($pfad_angepasst)) {
-			if (!copy($pfad . $ext, $pfad_angepasst))
-				return null;
-		}
-
-		return $sportsmanager_joomla_url . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst);
-	}
-
-	$new_width  = $width;
-	$new_height = $height;
-
-	if ($max_height > 0 && $new_height > $max_height) {
-		$new_width  = max(round($new_width * $max_height / $new_height), 1);
-		$new_height = $max_height;
-	}
-	if ($max_width > 0 && $new_width > $max_width) {
-		$new_height = max(round($new_height * $max_width / $new_width), 1);
-		$new_width  = $max_width;
-	}
-
-	if ($max_width > 0 && (($max_width - $new_width) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
-		$new_width += 1;
-	if ($max_height > 0 && (($max_height - $new_height) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
-		$new_height += 1;
-
-	$pfad_angepasst = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . max($fixed_width, $new_width) . "H" . max($fixed_height, $new_height) . "." . $ext;
-
-	if (!is_file($pfad_angepasst)) {
-		$image = $ext == "png" ? imagecreatefrompng($pfad . $ext) : imagecreatefromjpeg($pfad . $ext);
-		if ($image === false)
-			return null;
-
-		$image_resized = imagecreatetruecolor(max($fixed_width, $new_width), max($fixed_height, $new_height));
-		$color         = $ext == "png" ? imagecolorallocatealpha($image_resized, 0, 0, 0, 127) : imagecolorallocate($image_resized, 64, 64, 64);
-		imagefill($image_resized, 0, 0, $color);
-		imagecopyresampled($image_resized, $image, round((imagesx($image_resized) - $new_width) / 2), round((imagesy($image_resized) - $new_height) / 2), 0, 0, $new_width, $new_height, $width, $height);
-		if ($ext == "png") {
-			imagesavealpha($image_resized, true);
-			imagepng($image_resized, $pfad_angepasst);
-		}
-		else
-			imagejpeg($image_resized, $pfad_angepasst);
-	}
-
-	return $sportsmanager_joomla_url . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst);
-}
-
-/*
- * #resize=250
-#resize=250,250,blue
-#resize=250,250,blue
-#resize=250,250&sizes=60%,80%,200%
-#resize=250,250,cover&sizes=60%,80%,200%
-#resize=250,250,fill&sizes=60%,80%,200%
-#crop=250,250,center,top
-#crop=250,250
-#crop=250,250,center,bottom
-#crop=250,250,left
-#crop=250,250,right
- */
-function yoothemeBild($typ, $id, $resize = '', $zusatz = "", $alternativ)
 {
 	global $sportsmanager_joomla_path;
-	global $sportsmanager_joomla_url;
-
-	$typ_exploded = explode("/", $typ);
-	$typ          = $typ_exploded[0];
-	$typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
-	$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-
-	if (is_file($pfad . "png"))
-		$ext = "png";
-	else if (is_file($pfad . "jpg"))
-		$ext = "jpg";
-	else if (!empty($alternativ)) {
-		$id   = $alternativ;
-		$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-		if (is_file($pfad . "png"))
-			$ext = "png";
-		else if (is_file($pfad . "jpg"))
-			$ext = "jpg";
-		else
-			return null;
-	}
-	else
-		return null;
-
-	$time = filemtime($pfad . $ext);
-
-	$bildpfad = "images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . "." . $ext;
-
-
-	return '<img  class="el-image" data-src="' . $bildpfad . $resize . '" ' . $zusatz . ' uk-img />';
-}
-
-/* 
-Quick and dirty DTFL Logo Bilder
-*/
-
-function logoBilder($typ, $id, $resize = '', $zusatz = "", $alternativ)
-{
-	global $sportsmanager_joomla_path;
-	global $sportsmanager_joomla_url;
-
-	$typ_exploded = explode("/", $typ);
-	$typ          = $typ_exploded[0];
-	$typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
-	$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-
-	if (is_file($pfad . "png"))
-		$ext = "png";
-	else if (is_file($pfad . "jpg"))
-		$ext = "jpg";
-	else if (!empty($alternativ)) {
-		$id   = $alternativ;
-		$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-		if (is_file($pfad . "png"))
-			$ext = "png";
-		else if (is_file($pfad . "jpg"))
-			$ext = "jpg";
-		else
-			return null;
-	}
-	else
-		return null;
-
-	$time = filemtime($pfad . $ext);
-
-	$bildpfad = "images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . "." . $ext;
-
-
-	return '<img  class="el-image" data-src="' . $bildpfad . $resize . '" ' . $zusatz . ' uk-img />';
-}
-
-function bildHTML($typ, $id, $fixed_width = 0, $fixed_height = 0, $max_width = 0, $max_height = 0, $zusatz = "", $alternativ = "") {
-	global $sportsmanager_joomla_path;
-	global $sportsmanager_joomla_url;
-
-	$typ_exploded = explode("/", $typ);
-	$typ          = $typ_exploded[0];
-	$typ_prefix   = count($typ_exploded) > 1 ? $typ_exploded[1] : "";
-
-	$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-	if (is_file($pfad . "png"))
-		$ext = "png";
-	else if (is_file($pfad . "jpg"))
-		$ext = "jpg";
-	else if (!empty($alternativ)) {
-		$id   = $alternativ;
-		$pfad = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . $id . ".";
-		if (is_file($pfad . "png"))
-			$ext = "png";
-		else if (is_file($pfad . "jpg"))
-			$ext = "jpg";
-		else
-			return null;
-	}
-	else
-		return null;
-
-	$time = filemtime($pfad . $ext);
-
-	if ($fixed_width > 0 && $fixed_height > 0) {
-		$pfad_angepasst = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $fixed_width . "H" . $fixed_height . "." . $ext;
-		if (is_file($pfad_angepasst)) {
-			return '<img src="' . $sportsmanager_joomla_url . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst) . '" width="' . $fixed_width . '" height="' . $fixed_height . '" ' . $zusatz . ' />';
-		}
-	}
-
-	$size   = getimagesize($pfad . $ext);
-	$width  = $size[0];
-	$height = $size[1];
-
-	$max_width  = $fixed_width > 0 ? $fixed_width : $max_width;
-	$max_height = $fixed_height > 0 ? $fixed_height : $max_height;
-
-	if (($fixed_width == 0 || $width == $fixed_width) && ($fixed_height == 0 || $height == $fixed_height) && ($fixed_width != 0 || $max_width == 0 || $width <= $max_width) && ($fixed_height != 0 || $max_height == 0 || $height <= $max_height)) {
-		$pfad_angepasst = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . $width . "H" . $height . "." . $ext;
-		if (!is_file($pfad_angepasst)) {
-			if (!copy($pfad . $ext, $pfad_angepasst))
-				return null;
-		}
-
-		return '<img src="' . $sportsmanager_joomla_url . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst) . '" width="' . $width . '" height="' . $height . '" ' . $zusatz . ' />';
-	}
-
-	$new_width  = $width;
-	$new_height = $height;
-
-	if ($max_height > 0 && $new_height > $max_height) {
-		$new_width  = max(round($new_width * $max_height / $new_height), 1);
-		$new_height = $max_height;
-	}
-	if ($max_width > 0 && $new_width > $max_width) {
-		$new_height = max(round($new_height * $max_width / $new_width), 1);
-		$new_width  = $max_width;
-	}
-
-	if ($max_width > 0 && (($max_width - $new_width) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
-		$new_width += 1;
-	if ($max_height > 0 && (($max_height - $new_height) % 2) == 1)        // Toleranz bei nur 1 Pixel Unterschied
-		$new_height += 1;
-
-	$pfad_angepasst = $sportsmanager_joomla_path . "/images/sportsmanager/" . $typ . "/" . $typ_prefix . "I" . $id . "T" . $time . "W" . max($fixed_width, $new_width) . "H" . max($fixed_height, $new_height) . "." . $ext;
-
-	if (!is_file($pfad_angepasst)) {
-		$image = $ext == "png" ? imagecreatefrompng($pfad . $ext) : imagecreatefromjpeg($pfad . $ext);
-		if ($image === false)
-			return null;
-
-		$image_resized = imagecreatetruecolor(max($fixed_width, $new_width), max($fixed_height, $new_height));
-		$color         = $ext == "png" ? imagecolorallocatealpha($image_resized, 0, 0, 0, 127) : imagecolorallocate($image_resized, 64, 64, 64);
-		imagefill($image_resized, 0, 0, $color);
-		imagecopyresampled($image_resized, $image, round((imagesx($image_resized) - $new_width) / 2), round((imagesy($image_resized) - $new_height) / 2), 0, 0, $new_width, $new_height, $width, $height);
-		if ($ext == "png") {
-			imagesavealpha($image_resized, true);
-			imagepng($image_resized, $pfad_angepasst);
-		}
-		else
-			imagejpeg($image_resized, $pfad_angepasst);
-	}
-
-	return '<img src="' . $sportsmanager_joomla_url . 'images/sportsmanager/' . $typ . '/' . basename($pfad_angepasst) . '" width="' . max($fixed_width, $new_width) . '" height="' . max($fixed_height, $new_height) . '" ' . $zusatz . ' />';
-}
-
-function terminDokumentname($id) {
-	global $sportsmanager_joomla_path;
 
 	$pfad      = $sportsmanager_joomla_path . "/images/sportsmanager/termine";
-	$dokumente = JFolder::files($pfad, '^' . $id . ' ');
+	$dokumente = Folder::files($pfad, '^' . $id . ' ');
 
 	return !empty($dokumente) ? substr($dokumente[0], strlen((string) $id) + 1) : false;
 }
-
-function lightBoxJSShow($lightbox_class = "lightbox") {
-	return "show" . $lightbox_class . "();";
-}
-
-function lightBoxJSHide($lightbox_class = "lightbox") {
-	return "hide" . $lightbox_class . "();";
-}
-
-function lightBoxClassHide($lightbox_class = "lightbox") {
-	return $lightbox_class . "_close";
-}
-
-function lightBoxHeader($lightbox_class = "lightbox") {
-	?>
-    <style type="text/css">
-        div<?php echo "#" . $lightbox_class; ?> {
-            position: fixed;
-            left: 50px;
-            right: 50px;
-            top: 50px;
-            bottom: 50px;
-            border: 1px solid #999999;
-            overflow: scroll;
-            background-color: #e4e4e4;
-            padding: 20px;
-            display: none;
-            visibility: hidden;
-        }
-
-        div<?php echo "#" . $lightbox_class . "_close"; ?> {
-            position: fixed;
-            right: 0px;
-            top: 0px;
-            bottom: 0px;
-            left: 0px;
-            overflow: hidden;
-            display: none;
-            visibility: hidden;
-            background-color: rgba(0, 0, 0, 0.8);
-        }
-    </style>
-
-    <script type="text/javascript">
-      //<!--
-      function show<?php echo $lightbox_class; ?>() {
-        document.getElementById("<?php echo $lightbox_class; ?>").style.display = "inline";
-        document.getElementById("<?php echo $lightbox_class; ?>").style.visibility = "visible";
-        document.getElementById("<?php echo $lightbox_class . "_close"; ?>").style.display = "inline";
-        document.getElementById("<?php echo $lightbox_class . "_close"; ?>").style.visibility = "visible";
-      }
-
-      function hide<?php echo $lightbox_class; ?>() {
-        document.getElementById("<?php echo $lightbox_class; ?>").style.display = "none";
-        document.getElementById("<?php echo $lightbox_class; ?>").style.visibility = "hidden";
-        document.getElementById("<?php echo $lightbox_class . "_close"; ?>").style.display = "none";
-        document.getElementById("<?php echo $lightbox_class . "_close"; ?>").style.visibility = "hidden";
-      }
-
-      //-->
-    </script>
-	<?php
-}

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"
@@ -21,6 +21,7 @@ COM_SPORTSMANAGER_LOCATIONS="Spielorte"
 COM_SPORTSMANAGER_SEASONS="Saisons"
 COM_SPORTSMANAGER_TEAM_PLANS="Mannschaftsspielpläne"
 COM_SPORTSMANAGER_TEAM_NAME="Mannschaftsname"
+COM_SPORTSMANAGER_TEAM_NAME_SHORT="Mannschaftsname kurz (max 24)"
 COM_SPORTSMANAGER_TEAM_NAME2="Vereinsname"
 COM_SPORTSMANAGER_TEAM_SEAT="Vereinssitz"
 COM_SPORTSMANAGER_POSTPONE_RULES="Verschieberegeln"
@@ -38,6 +39,8 @@ COM_SPORTSMANAGER_ORGANISATION="Organisation"
 COM_SPORTSMANAGER_TEAM_MEMBERS="Mannschaftsmitglieder"
 COM_SPORTSMANAGER_TEAM_MEMBERS2=Vereinsmitglieder
 COM_SPORTSMANAGER_MEMBERS="Mitglieder"
+COM_SPORTSMANAGER_MEMBER="Mitglied"
+COM_SPORTSMANAGER_ACTIVE_MEMBERS="Aktive Mitglieder"
 COM_SPORTSMANAGER_TEAMS="Mannschaften"
 COM_SPORTSMANAGER_CURRENT_TEAMS="Aktuelle Mannschaften"
 COM_SPORTSMANAGER_PREVIOUS_TEAMS="Frühere Mannschaften"
@@ -74,13 +77,13 @@ COM_SPORTSMANAGER_GAME="Spiel"
 COM_SPORTSMANAGER_GAMES="Spiele"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="S"
 COM_SPORTSMANAGER_ADD_PLAYER_STATISTICS="Spielerstatistik hinzufügen"
-COM_SPORTSMANAGER_PLAYER_STATISTICS="Spielerstatistik"
+COM_SPORTSMANAGER_PLAYER_STATISTIC="Spielerstatistik"
 COM_SPORTSMANAGER_COMPETITION="Wettbewerb"
 COM_SPORTSMANAGER_COMPETITIONS="Wettbewerbe"
 COM_SPORTSMANAGER_IN_COMPETITIONS="in Wettbewerb"
 COM_SPORTSMANAGER_COMPETITIONS_SHORTCUT="W"
 COM_SPORTSMANAGER_DUPLICATE="Duplizieren"
-COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Willst du die Spielerstatistik wirklich entfernen?"
+COM_SPORTSMANAGER_CONFIRM_REMOVE_PLAYER_STATISTICS="Willst du die Spielerstatistik wirklich entfernen?"
 COM_SPORTSMANAGER_LIVE_TICKER="Live-Ticker"
 COM_SPORTSMANAGER_PLACE="Platz"
 COM_SPORTSMANAGER_TEAM="Mannschaft"
@@ -129,10 +132,13 @@ COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT="1/4"
 COM_SPORTSMANAGER_ROUND_OF_16="Achtelfinale"
 COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT="1/8"
 COM_SPORTSMANAGER_ROUND_OF_32="Sechzehntelfinale"
+COM_SPORTSMANAGER_ROUND_OF_32_ALT="16-tel-Finale"
 COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT="1/16"
 COM_SPORTSMANAGER_ROUND_OF_64="Zweiunddreißigstelfinale"
+COM_SPORTSMANAGER_ROUND_OF_64_ALT="32-tel-Finale"
 COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT="1/32"
 COM_SPORTSMANAGER_ROUND_OF_128="Vierundsechzigstelfinale"
+COM_SPORTSMANAGER_ROUND_OF_128_ALT="64-tel-Finale"
 COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT="1/64"
 COM_SPORTSMANAGER_DAY_0_SHORTCUT="So."
 COM_SPORTSMANAGER_DAY_1_SHORTCUT="Mo."
@@ -259,6 +265,7 @@ COM_SPORTSMANAGER_IN="in"
 COM_SPORTSMANAGER_NATIONAL="Nationale"
 COM_SPORTSMANAGER_INTERNATIONAL="Internationale"
 COM_SPORTSMANAGER_PLAYER_NUMBER_SHORT="Spielernr."
+COM_SPORTSMANAGER_ASSOCIATION_SHORT_NAME="Verbands-Kürzel"
 COM_SPORTSMANAGER_BASIC_PLAYER_NUMBER_SHORT="Basis-Spielernr."
 COM_SPORTSMANAGER_MESSAGES="Meldungen"
 COM_SPORTSMANAGER_TOURNAMENT_PLACEMENT="Turnierplatzierungen"
@@ -289,7 +296,6 @@ COM_SPORTSMANAGER_REQUEST_MESSAGE_PLURAL="Es müssen mindestens %d Termine v
 COM_SPORTSMANAGER_REJECT_SHIFT="Verschiebung ablehnen"
 COM_SPORTSMANAGER_TO="bis"
 COM_SPORTSMANAGER_PLAYER_STATISTICS="Spielerstatistiken"
-COM_SPORTSMANAGER_PERFORMANCE_INDEX="Leistungsindex"
 COM_SPORTSMANAGER_PERFORMANCE_INDEX_SHORTCUT="LI"
 COM_SPORTSMANAGER_WON="gewonnen"
 COM_SPORTSMANAGER_LOST="verloren"
@@ -311,6 +317,11 @@ COM_SPORTSMANAGER_FOR_OTHER_CONTACT="Für andere Ansprechpartner"
 COM_SPORTSMANAGER_DATES_REGISTERED_USERS="Termine beantragten durch angemeldete Benutzer"
 COM_SPORTSMANAGER_VIEW_ELO_RATING="Elo-Wertung anzeigen"
 COM_SPORTSMANAGER_VIEW_SPORTSMANAGER_LIZENZ="Lizenz anzeigen"
+COM_SPORTSMANAGER_VIEW_LEAST_MEMBER_COUNT="Mindest Mitgliederzahl zeigen (Vereine)"
+COM_SPORTSMANAGER_SHOW_ORGANISATION="Spalte Verband zeigen (Vereine)"
+COM_SPORTSMANAGER_SHOW_MEMBER_COUNT="Spalte Mitglieder Zeigen (Vereine)"
+COM_SPORTSMANAGER_SHOW_TOURNAMENT_BRACKET="Turnierbaum anzeigen"
+COM_SPORTSMANAGER_USE_DISCIPLINARY_FINE="Ordnungsstrafen verwenden"
 COM_SPORTSMANAGER_PLAYER_DETAILS="Spielerdetails"
 COM_SPORTSMANAGER_PLAYER_LIST_DETAILS="Spielerliste/-details"
 COM_SPORTSMANAGER_PLAYER_EDIT="Spielerdaten durch Organisations-/Vereinsansprechpartner bearbeiten"
@@ -353,6 +364,7 @@ COM_SPORTSMANAGER_STATISTIK="Statistik"
 COM_SPORTSMANAGER_PLAYERS_ACTIVE="Spieler aktiv"
 COM_SPORTSMANAGER_RESTRICTED_PLAYERS="Spieler eingeschränkt"
 COM_SPORTSMANAGER_PLAYER_PASSIV="Spieler passiv"
+COM_SPORTSMANAGER_PLAYER_UNATTACHED="Spieler vereinslos"
 COM_SPORTSMANAGER_MEN_ACTIVE="Herren aktiv"
 COM_SPORTSMANAGER_WOMEN_ACTIVE="Damen aktiv"
 COM_SPORTSMANAGER_JUNIOR_ACTIVE="Junioren aktiv"
@@ -366,7 +378,7 @@ COM_SPORTSMANAGER_BIRTHYEAR="Geburtsjahr"
 COM_SPORTSMANAGER_NAT="Nat. #"
 COM_SPORTSMANAGER_INT="Intern. #"
 COM_SPORTSMANAGER_REMOVE_MESSAGE="Willst du den Spieler wirklich entfernen?"
-COM_SPORTSMANAGER_BIRTHDATE="Geburtstag"
+COM_SPORTSMANAGER_BIRTHDATE = "Geburtstag"
 COM_SPORTSMANAGER_PLACE_SHORTCUT="PLZ / Ort"
 COM_SPORTSMANAGER_PHONE="Telefon"
 COM_SPORTSMANAGER_MOBILE="Mobil"
@@ -380,6 +392,7 @@ COM_SPORTSMANAGER_MEMBER_STATUS="Mitgliedsstatus"
 COM_SPORTSMANAGER_ACTIVE="Aktiv"
 COM_SPORTSMANAGER_RESTRICTED="Eingeschränkt"
 COM_SPORTSMANAGER_BEATEN="Ausgetreten"
+COM_SPORTSMANAGER_HIDE="Verstecken"
 COM_SPORTSMANAGER_PASSIVE="Passiv"
 COM_SPORTSMANAGER_BEATEN_CLUB="Verein ausgetreten"
 COM_SPORTSMANAGER_SINGLE_SEED="Elo-Startwert Einzel"
@@ -402,10 +415,11 @@ COM_SPORTSMANAGER_EXPORT="Exportieren"
 COM_SPORTSMANAGER_INTERNATIONAL_PLAYERS="Spieler (international)"
 COM_SPORTSMANAGER_COUNTRY_CODE="Landeskennung"
 COM_SPORTSMANAGER_IMPORT="Importieren"
-COM_SPORTSMANAGER_IMPORT_MESSAGE="Im Import sind ausschließlich Spielerdaten zum Verein %s enthalten. Soll ausschließlich der Spielerbestand des einen Vereins aktualisiert werden, muss der zugehörige Verein unten ausgewählt werden. Beinhaltet der Import den gesamten Spielerbestand einer Organisation, muss die zugehörige Organisation gewählt werden."
+COM_SPORTSMANAGER_IMPORT_MESSAGE="Im Import sind ausschlie&szlig;lich Spielerdaten zum Verein %s enthalten. Soll ausschlie&szlig;lich der Spielerbestand des einen Vereins aktualisiert werden, muss der zugeh&ouml;rige Verein unten ausgew&auml;hlt werden. Beinhaltet der Import den gesamten Spielerbestand einer Organisation, muss die zugeh&ouml;rige Organisation gew&auml;hlt werden.<br />Bei schon vorhandener Lizenznummer wird die Lizenznummer und das Geburtsjahr nicht &uuml;berschrieben!"
 COM_SPORTSMANAGER_CHECK="Pr&uuml;fen"
-COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="Im Import sind Konflikte enthalten, die im Vorfeld manuell beseitigt werden müssen."
+COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="Im Import sind Fehler oder Konflikte enthalten, die im Vorfeld manuell beseitigt werden müssen."
 COM_SPORTSMANAGER_IMPORT_DUPLICATE_MESSAGE="Versuch, Spielernr. auf eine bereits für einen anderen Spieler vergebene Spielernr. zu ändern"
+COM_SPORTSMANAGER_IMPORT_WRONG_FORMAT_PLAYERNUMBER="Eine oder mehrere Spielernummer enthalten ein ung&uuml;ltiges Format"
 COM_SPORTSMANAGER_NAME2="Name"
 COM_SPORTSMANAGER_DATA_IMPORT_ABORT_MESSAGE="Der Import wird abgebrochen, da Konflikte bei den zu importierenden Spielerdaten bestehen. Bitte kontaktiere einen Moderator und sende dabei die Importdatei mit!"
 COM_SPORTSMANAGER_DATA_IMPORT_NO_CONFLICTS="Es bestehen keine Konflikte bei den zu importierenden Spielerdaten."
@@ -502,7 +516,6 @@ COM_SPORTSMANAGER_ADD_POINTS_TABLE="Punktetabelle hinzuf&uuml;gen"
 COM_SPORTSMANAGER_ADD_FUNCTION="Funktion hinzuf&uuml;gen"
 COM_SPORTSMANAGER_PARTICIPANT="Teilnehmer"
 COM_SPORTSMANAGER_FUNCTION="Funktion"
-COM_SPORTSMANAGER_MULTIPLIER="Multiplikator"
 COM_SPORTSMANAGER_MAXIMUM="maximal"
 COM_SPORTSMANAGER_CONTRACTION="K&uuml;rzel"
 COM_SPORTSMANAGER_ELIGIBLE_ORGANIZERS="Berechtigte f&uuml;r Veranstalter"
@@ -536,6 +549,7 @@ COM_SPORTSMANAGER_FULL_RATING="Volle Wertung"
 COM_SPORTSMANAGER_NO_RATING="Keine Wertung"
 COM_SPORTSMANAGER_TEAM_COMPETITIONS="Mannschaftswettbewerbe"
 COM_SPORTSMANAGER_TABLE_SUMMARY="Tabellenwertung"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_RECORD="Direkter Vergleich"
 COM_SPORTSMANAGER_POINTS_WON_LOST_DIFFERENCE="Spielpunkte gewonnen, Spielpunkte verloren, Punktedifferenz"
 COM_SPORTSMANAGER_PERFORMANCE_INDEX="Leistungsindex (SP+ * SP+ * 100) / (SP+ + SP-), Spielpunkte gewonnen, ..."
 COM_SPORTSMANAGER_PERFORMANCE_INDEX2="Leistungsindex (S * P+ * 10) / (P+ + P-), Spielpunkte gewonnen, ..."
@@ -562,7 +576,7 @@ COM_SPORTSMANAGER_PRIVATE_PLAYER_DATA="Private Spielerdaten in Vereins- und Mann
 COM_SPORTSMANAGER_ASSOCIATIONS_MEMBERSHIPS_MANAGE="Vereine und Mitgliedschaften verwalten"
 COM_SPORTSMANAGER_MANAGE_CLASSIFICATIONS="Einstufungen verwalten"
 COM_SPORTSMANAGER_MANAGE_TEAM_PLANS="Mannschaftsspielpläne verwalten"
-COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Verschieberegeln verwalten"
+COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Spielverlegungen/Verschieberegeln verwalten"
 COM_SPORTSMANAGER_MANAGE_VENUES="Spielorte verwalten"
 COM_SPORTSMANAGER_MANAGE_TEAM_COMPETITIONS="Mannschaftswettbewerbe verwalten"
 COM_SPORTSMANAGER_MANAGE_PLAYER_STATISTICS="Spielerstastistiken verwalten"
@@ -604,7 +618,10 @@ COM_SPORTSMANAGER_ONLY_DETAILED_RATING_POINT_DIFFERENCE="Nur Detailwertung nach
 COM_SPORTSMANAGER_ONLY_DETAILED_POINTS_AFTER_POINTSRATE="Nur Detailwertung nach Punktequote"
 COM_SPORTSMANAGER_KO_SIMPLE_FULL="K.O. (einfach oder vollstaendige Ausspielung aller Plaetze)"
 COM_SPORTSMANAGER_MANUAL_PRO_TEAMS="Manuell (pro Mannschaft)"
+COM_SPORTSMANAGER_CUP_DRAW_EVERY_ROUND="Pokal: Jede Runde wird neu gelost"
+COM_SPORTSMANAGER_CUP_USING_SEEDING_LIST="Pokal: Losen einer Setzliste"
 COM_SPORTSMANAGER_SUBDIVISION="Unterteilung"
+COM_SPORTSMANAGER_SHOW_MATCHDAY_TITLE="Titel von Spieltag zeigen"
 COM_SPORTSMANAGER_ELO_RATING="ELO-Wertung"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_EVENT="Berechtigte f&uuml;r Veranstaltung"
 COM_SPORTSMANAGER_TITLE_LOGO="Titel-Logo"
@@ -632,6 +649,9 @@ COM_SPORTSMANAGER_GAMEDAY="Spieltag"
 COM_SPORTSMANAGER_GAMEDAYS="Spieltage"
 COM_SPORTSMANAGER_ROUND="Runde"
 COM_SPORTSMANAGER_ROUNDS="Runden"
+COM_SPORTSMANAGER_ROUND_TITLE="Runde Bezeichnung"
+COM_SPORTSMANAGER_DRAW_FOR_HOME="Heimrecht auslosen"
+COM_SPORTSMANAGER_MATCH_PLACE3="Spiel um Platz 3"
 COM_SPORTSMANAGER_MONTH="Monat"
 COM_SPORTSMANAGER_MONTHS="Monate"
 COM_SPORTSMANAGER_PLAYER_FROM_TEAM="Spieler von Mannschaft"
@@ -647,8 +667,14 @@ COM_SPORTSMANAGER_SO_FAR="bisher"
 COM_SPORTSMANAGER_PLACEMENT_AREA="Platzierungsbereich"
 COM_SPORTSMANAGER_IMAGE_WITHIN_TEAM="Bild innerhalb Mannschaft"
 COM_SPORTSMANAGER_ADD_MEETING="Begegnung hinzuf&uuml;gen"
+COM_SPORTSMANAGER_GAMEDAY_GENERATION="Spieltag erzeugen"
 COM_SPORTSMANAGER_ROUND_GENERATION="Runde erzeugen"
+COM_SPORTSMANAGER_CUP_ROUND_GENERATION="Pokalrunde auslosen"
 COM_SPORTSMANAGER_GENERATE_GROUP_GAME="Gruppenspiele erzeugen"
+COM_SPORTSMANAGER_IMPORT_GROUP_GAME="Gruppenspiele importieren"
+COM_SPORTSMANAGER_IMPORT_GROUP_GAME2="Gruppenspiele: Importieren"
+COM_SPORTSMANAGER_IMPORT_GROUP_GAME_IMPORTED="Begegnungen wurden importiert"
+COM_SPORTSMANAGER_IMPORT_GROUP_GAME_CREATED="Begegnungen wurden erstellt"
 COM_SPORTSMANAGER_REMOVE_ALL_ENCOUNTERS="Willst du wirklich alle Begegnungen entfernen?"
 COM_SPORTSMANAGER_REMOVE_ALL_MATCHES="Alle Begegnungen entfernen"
 COM_SPORTSMANAGER_HOME_TEAM="Heimteam"
@@ -694,6 +720,7 @@ COM_SPORTSMANAGER_NUMBER_DAYS="%d Tage"
 COM_SPORTSMANAGER_CALENDAR_WEEK="Kalenderwoche"
 COM_SPORTSMANAGER_CALENDAR_WEEK_SHORTCUT="KW"
 COM_SPORTSMANAGER_PAIRING="Paarung"
+COM_SPORTSMANAGER_SETTING="Setzen"
 COM_SPORTSMANAGER_PAIRINGS="Paarungen"
 COM_SPORTSMANAGER_INTERMITTENT="Aussetzend"
 COM_SPORTSMANAGER_MAXIMUM_SETS="S&auml;tze maximal"
@@ -770,6 +797,7 @@ COM_SPORTSMANAGER_FEDERAL_STATES="Bundesl&auml;nder"
 COM_SPORTSMANAGER_STATES="L&auml;nder"
 COM_SPORTSMANAGER_YEAR="Jahr"
 COM_SPORTSMANAGER_ADDITION="Zusatz"
+COM_SPORTSMANAGER_LOCATION="Ort"
 COM_SPORTSMANAGER_STATE="Land"
 COM_SPORTSMANAGER_FEDERAL_="Bundes-"
 COM_SPORTSMANAGER_INFO="Info"
@@ -783,7 +811,6 @@ COM_SPORTSMANAGER_APPLIED_FOR="Beantragt"
 COM_SPORTSMANAGER_DECLINED="Abgelehnt"
 COM_SPORTSMANAGER_DATE_DETAILS="Termin: Details"
 COM_SPORTSMANAGER_ADDITIONS="Zus&auml;tze"
-COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Weitere Informationen"
 COM_SPORTSMANAGER_PUBLIC_EMAIL="E-Mail &ouml;ffentlich"
 COM_SPORTSMANAGER_EMAIL_WITH_CHANGES="E-Mail bei &Auml;nderungen"
 COM_SPORTSMANAGER_ACTION_TYPE="Aktionstyp"
@@ -827,7 +854,6 @@ COM_SPORTSMANAGER_REMOVE_STATE_REALLY="Willst du das Land wirklich entfernen?"
 COM_SPORTSMANAGER_DATES_STATE="Termine Land"
 COM_SPORTSMANAGER_RENAME_APPOINTMENTS_STATE="Termine mit dem bisherigen Land umbenennen"
 COM_SPORTSMANAGER_FINAL_RANKING="FINAL RANKING"
-COM_SPORTSMANAGER_HOME_TEAM2="Heimmanschaft"
 COM_SPORTSMANAGER_RESULTS2="Resultat"
 COM_SPORTSMANAGER_NO_GAMES="Keine Spiele"
 COM_SPORTSMANAGER_END_GAME="Endspiel"
@@ -860,6 +886,9 @@ COM_SPORTSMANAGER_INITIAL_APPOINTMENT_SUGGESTIONS="Initiale Terminvorschl&auml;g
 COM_SPORTSMANAGER_REQUESTING_TEAM="Beantragende Mannschaft"
 COM_SPORTSMANAGER_OPPONENT_TEAM="Gegnerische Mannschaft"
 COM_SPORTSMANAGER_AGAINST_PROPOSALS_ALLOWED="Gegensvorschl&auml;ge zul&auml;ssig"
+COM_SPORTSMANAGER_REASON_REQUIRED="Begr&uuml;ndung erforderlich"
+COM_SPORTSMANAGER_CLUB_ENTITLEMENT="Berechtigung Vereine"
+COM_SPORTSMANAGER_ASSOCIATION_ENTITLEMENT="Berechtigung Verband"
 COM_SPORTSMANAGER_LEAD_TIME="Vorlaufzeit"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MINIMAL="Terminvorschl&auml;ge minimal"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MAXIMUM="Terminvorschl&auml;ge maximal"
@@ -869,6 +898,11 @@ COM_SPORTSMANAGER_OPTIONAL_BUT_SAME_IN_DOUBLES="Optional, aber im Doppel keiner
 COM_SPORTSMANAGER_REQUIRED="Erforderlich"
 COM_SPORTSMANAGER_RESULT_ONLY="Nur Ergebnis"
 COM_SPORTSMANAGER_GAME_NUMBER="Spiel %d"
+COM_SPORTSMANAGER_LABEL_GAME_NUMBER="Spiel Nr"
+COM_SPORTSMANAGER_LABEL_GAME_TITLE="Spieltag Titel"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES="Explizite Strafen"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_SUBJECT="%s: Strafpunkte erhalten"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_BODY="%s wurden %f Strafpunkte zugeteilt mit der Begründung: %s"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_SUBJECT="%s vs %s: Spieltermin verlegen"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_BODY="Zur Begegnung %s gegen %s am %s in %s wird von %s der Spieltermin verschoben.\n\nAlternative Termine:\n\n"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_REQUESTED_BODY="Zur Begegnung %s gegen %s am %s in %s wird von %s der Spieltermin verschoben.\n\nBitte alternative Termine vorschlagen unter %s"
@@ -925,3 +959,143 @@ COM_SPORTSMANAGER_RANK="Rang"
 
 ; SPIELER BEARBEITEN
 COM_SPORTSMANAGER_LIZENZ="Lizenz"
+COM_SPORTSMANAGER_ARIA_LABEL_MATCHDAY_SELECT="Wähle einen Spieltag"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_DAY="Wähle den Tag des Begegnungsvorschlags"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MONTH="Wähle den Monat des Begegnungsvorschlags"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_YEAR="Wähle das Jahr des Begegnungsvorschlags"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_HOUR="Wähle die Stunde des Begegnungsvorschlags"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MINUTE="Wähle die Minute des Begegnungsvorschlags"
+COM_SPORTSMANAGER_ARIA_LABEL_SPECIAL_FILTER="Erweiterter Filter"
+COM_SPORTSMANAGER_ARIA_LABEL_PLACE="Ort"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_CLUB="Wähle berechtigten Verein"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_START_MONTH="Monat des Turnierbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_START_YEAR="Jahr des Turnierbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_END_MONTH="Monat des Turnierendes"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_END_YEAR="Jahr des Turnierendes"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_USER="Wähle berechtigten Anwender"
+COM_SPORTSMANAGER_ARIA_LABEL_POINTS_GUEST="Punkte Gast"
+COM_SPORTSMANAGER_ARIA_LABEL_POINTS_HOME="Punkte Heim"
+COM_SPORTSMANAGER_ARIA_LABEL_PLAYER_GUEST="Spieler Gast"
+COM_SPORTSMANAGER_ARIA_LABEL_PLAYER_HOME="Spieler Heim"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MONTH="Wähle den Monat"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_YEAR="Wähle das Jahr"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_HOUR="Wähle eine Stunde"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MINUTE="Wähle eine Minute"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_NUMBER_GUEST="Spiel Gast"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_NUMBER_HOME="Spiel Heim"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_LINK_DOUBLE="Verknüpfung Doppel"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_LINK_SINGLE="Verknüpfung Einzel"
+COM_SPORTSMANAGER_ARIA_LABEL_PLACEMENT_MIN="Platzierung Min."
+COM_SPORTSMANAGER_ARIA_LABEL_PLACEMENT_MAX="Platzierung Max."
+COM_SPORTSMANAGER_ARIA_LABEL_PARTICIPANT_MIN="Teilnehmer Min."
+COM_SPORTSMANAGER_ARIA_LABEL_PARTICIPANT_MAX="Teilnehmer Max."
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_START_MONTH="Monat des Ranglistenbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_START_YEAR="Jahr des Ranglistenbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_END_MONTH="Monat des Ranglistenendes"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_END_YEAR="Jahr des Ranglistenendes"
+COM_SPORTSMANAGER_ARIA_LABEL_MAXIMUM_EVALUATED_COUNT="Maximal gewertete Teilnahmen"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_START_MONTH="Monat des Statistikbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_START_YEAR="Jahr des Statistikbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_END_MONTH="Monat des Statistikendes"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_END_YEAR="Jahr des Statistikendes"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_ORGANIZER="Wähle berechtigten Veranstalter"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_START_MONTH="Monat des Veranstaltungsbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_START_YEAR="Jahr des Veranstaltungsbeginns"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_END_MONTH="Monat des Veranstaltungsendes"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_END_YEAR="Jahr des Veranstaltungsendes"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRST_ROUND="Erste Runde"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRST_ROUND_TYPE="Erste Runde Typ"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRST_ROUND_PLACE="Erste Runde Platzierung"
+COM_SPORTSMANAGER_ARIA_LABEL_LAST_ROUND="Letzte Runde"
+COM_SPORTSMANAGER_ARIA_LABEL_LAST_ROUND_TYPE="Letzte Runde Typ"
+COM_SPORTSMANAGER_ARIA_LABEL_LAST_ROUND_PLACE="Letzte Runde Platzierung"
+COM_SPORTSMANAGER_ARIA_LABEL_ROUND_TYPE="Rundentyp"
+COM_SPORTSMANAGER_ARIA_LABEL_ROUND_PLACE="Rundenplatzierung"
+COM_SPORTSMANAGER_HOME_POINTS="Heim Punkte"
+COM_SPORTSMANAGER_GUEST_POINTS="Gast Punkte"
+COM_SPORTSMANAGER_ARIA_LABEL_ENCOUNTER_YEAR="Jahr der Begegnung"
+COM_SPORTSMANAGER_ARIA_LABEL_PAIRING_TEAM="Team für Paarung"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_COMPETITION="Wähle berechtigten Anwender"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_EVALUATION="Ranking Wertung"
+COM_SPORTSMANAGER_ARIA_LABEL_LASTNAME="Nachname"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRSTNAME="Vorname"
+COM_SPORTSMANAGER_ARIA_LABEL_CLUB="Verein"
+COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS="Verschiebungen"
+COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP="Spielverschiebungen durch diese Mannschaft"
+COM_SPORTSMANAGER_GAME_RESULT_DELAYS="Verzögerung"
+COM_SPORTSMANAGER_USE_EMAIL_REMINDERS="Verwende Email Erinnerungen"
+COM_SPORTSMANAGER_RULEBOOKS="Regelwerke"
+COM_SPORTSMANAGER_RULEBOOK="Regelwerk"
+COM_SPORTSMANAGER_RULE_SHORT="SPO"
+COM_SPORTSMANAGER_FEE_SHORT="GO"
+COM_SPORTSMANAGER_RULE_LONG="Paragraph SPO"
+COM_SPORTSMANAGER_FEE_LONG="Paragraph GO"
+COM_SPORTSMANAGER_SELECT="Auswahl"
+COM_SPORTSMANAGER_NO_SELECT="keine Auswahl"
+COM_SPORTSMANAGER_REALLY_REMOVE_RULEBOOK="Willst Du dieses Regelwerk wirklich entfernen?"
+COM_SPORTSMANAGER_ADD_RULEBOOK="Regelwerk hinzuf&uuml;gen"
+COM_SPORTSMANAGER_DISCIPLINARY_FINES="Ordnungsstrafen"
+COM_SPORTSMANAGER_DISCIPLINARY_FINE="Ordnungsstrafe"
+COM_SPORTSMANAGER_ISSUE_DISCIPLINARY_FINES="Ordnungsstrafe ausstellen"
+COM_SPORTSMANAGER_EDIT_DISCIPLINARY_FINE="Ordnungsstrafe bearbeiten"
+COM_SPORTSMANAGER_SEND_DISCIPLINARY_FINE="Ordnungsstrafe versenden"
+COM_SPORTSMANAGER_REALLY_REMOVE_DISCIPLINARY_FINES="Willst Du diese Ordnungsstrafe wirklich entfernen?"
+COM_SPORTSMANAGER_VIOLATIONS="Verst&ouml;&szlig;e"
+COM_SPORTSMANAGER_VIOLATION="Versto&szlig;"
+COM_SPORTSMANAGER_ADD_VIOLATION="Versto&szlig; hinzuf&uuml;gen"
+COM_SPORTSMANAGER_REALLY_REMOVE_VIOLATION="Willst Du diesen Versto&szlig; wirklich entfernen?"
+COM_SPORTSMANAGER_VIOLATION_TEXT="Text"
+COM_SPORTSMANAGER_VIOLATION_ADD_TEXT="Zusatztext"
+COM_SPORTSMANAGER_FEE="Geb&uuml;hr"
+COM_SPORTSMANAGER_ADD_FEE="Zusatzgeb&uuml;hr"
+COM_SPORTSMANAGER_SELECTABLE="Ausw&auml;hlbar"
+COM_SPORTSMANAGER_TEMPLATE="Vorlage"
+COM_SPORTSMANAGER_EMAIL_SUBJECT="Betreff"
+COM_SPORTSMANAGER_EMAIL_MESSAGE="Nachricht"
+COM_SPORTSMANAGER_EMAIL_TO="An"
+COM_SPORTSMANAGER_EMAIL_SEND="E-Mail senden"
+COM_SPORTSMANAGER_EMAIL_TEXT_TEMPLATE="Textvorlage"
+COM_SPORTSMANAGER_ISSUER="Aussteller"
+COM_SPORTSMANAGER_ISSUE_DATE="Ausstelldatum"
+COM_SPORTSMANAGER_SENDER="Sender"
+COM_SPORTSMANAGER_BILL_ISSUER="Rechnung erstellt"
+COM_SPORTSMANAGER_MULTIPLIER="Multiplikator"
+COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Weitere Angaben"
+COM_SPORTSMANAGER_EMAIL_WAS_SEND="Die E-Mail wurde erfolgreich versendet"
+COM_SPORTSMANAGER_EMAIL_WAS_NOT_SEND="Die E-Mail wurde nicht versendet"
+COM_SPORTSMANAGER_OLD_DATE="Alter Termin"
+COM_SPORTSMANAGER_NEW_DATE="Neuer Termin"
+COM_SPORTSMANAGER_REASON_GAME_APPOINTMENT="Verlegungsgrund"
+COM_SPORTSMANAGER_MATCH_RESCHEDULINGS="Spielverlegungen"
+COM_SPORTSMANAGER_MATCH_RESCHEDULING="Spielverlegung"
+COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="Bei Heimrechttausch gleichen Termin eintragen"
+COM_SPORTSMANAGER_NOT_VALID_TIME="Ung&uuml;ltige Uhrzeit"
+COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Willst Du diesen Spielverlegung wirklich entfernen?"
+COM_SPORTSMANAGER_REST_DAYS="Ruhetage"
+COM_SPORTSMANAGER_TRAINING_DAYS="Trainingstage"
+COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Nicht aktualisierte Daten"
+COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"
+COM_SPORTSMANAGER_ASSOCIATION_BODY="Verbandsorgan"
+COM_SPORTSMANAGER_ADD_ASSOCIATION_BODY="Verbandsorgan hinzuf&uuml;gen"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY="Willst Du dieses Verbandsorgan wirklich entfernen?"
+COM_SPORTSMANAGER_INVALID_ASSOCIATION_BODY_NAME="Ung&uuml;ltiger Name f&uuml;r Verbandsorgan!"
+COM_SPORTSMANAGER_NAME_NOT_COMPLETE="Der Name ist nicht komplett ausgef&uuml;llt"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Zusatzinfo"
+COM_SPORTSMANAGER_USE_HTML="Hier sollte HTML-formatierter Text verwendet werden"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER="M&ouml;chtest du dieses Mitglied des Verbandsorgans wirklich entfernen?"
+COM_SPORTSMANAGER_HELP_EDIT_ASSOCIATION_BODY_MEMBER="Wird ein Name aus der Spielerliste ausgew&auml;hlt, werden Nachname und Vorname &uuml;bernommen.<br>Telefon, Mobil, E-Mail werden aus der Spielerliste &uuml;bernommen, wenn sie hier nicht ausgef&uuml;llt sind."
+COM_SPORTSMANAGER_HALL_OF_FAME="Hall of Fame"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME="Hall of Fame hinzuf&uuml;gen"
+COM_SPORTSMANAGER_INVALID_HALL_OF_FAME_NAME="Invalider Name f&uuml;r Hall of Fame"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME="Willst Du wirklich diese Hall of Fame mit allen Mitgliedern l&ouml;schen?"
+COM_SPORTSMANAGER_MATCH_TYPE="Spielform"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME_YEAR="Willst Du wirklich dieses Hall of Fame Jahr l&ouml;schen?"
+COM_SPORTSMANAGER_YEARS="Jahre"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME_YEAR="Hall of Fame Jahr hinzuf&uuml;gen"
+COM_SPORTSMANAGER_NO_ENTRY="kein Eintrag"
+COM_SPORTSMANAGER_REALLY_SWAP_MATCH="Willst Du wirklich das Heimrecht tauschen?"
+COM_SPORTSMANAGER_SWAP_MATCH="Heimrechttausch"
+COM_SPORTSMANAGER_REALLY_DELETE_MATCH_REPORT="Der Spielbericht wird zusammen mit allen historischen Eintr&auml;gen gel&ouml;scht. Willst du den Spielbericht wirklich l&ouml;schen?"
+COM_SPORTSMANAGER_MATCH_REPORT_DELETED="Spielbericht gel&ouml;scht"
+COM_SPORTSMANAGER_MATCH_REPORT_WAS_DELETED="Der Spielbericht wurde erfolgreich gel&ouml;scht!"
+COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Spielberichtskorrektur"

src/structure/language/en-GB/en-GB.com_sportsmanager.ini

@@ -1,4 +1,4 @@
-; Sports Manager (C) 2006-2020, Sven Nickel
+; Sports Manager (C) 2006-2020, Sven Nickel
 COM_SPORTSMANAGER="Sports Manager"
 COM_SPORTSMANAGER_PLAYERS="Players"
 COM_SPORTSMANAGER_CLUBS="Clubs"
@@ -21,6 +21,7 @@ COM_SPORTSMANAGER_LOCATIONS="Locations"
 COM_SPORTSMANAGER_SEASONS="Seasons"
 COM_SPORTSMANAGER_TEAM_PLANS="Team plans"
 COM_SPORTSMANAGER_TEAM_NAME="Team name"
+COM_SPORTSMANAGER_TEAM_NAME_SHORT="Team name short (max 24)"
 COM_SPORTSMANAGER_TEAM_NAME2="Club name"
 COM_SPORTSMANAGER_TEAM_SEAT="Club location"
 COM_SPORTSMANAGER_POSTPONE_RULES="Postpone rules"
@@ -38,6 +39,8 @@ COM_SPORTSMANAGER_ORGANISATION="Organisation"
 COM_SPORTSMANAGER_TEAM_MEMBERS="Team members"
 COM_SPORTSMANAGER_TEAM_MEMBERS2="Club members"
 COM_SPORTSMANAGER_MEMBERS="Members"
+COM_SPORTSMANAGER_MEMBER="Member"
+COM_SPORTSMANAGER_ACTIVE_MEMBERS="Active members"
 COM_SPORTSMANAGER_TEAMS="Teams"
 COM_SPORTSMANAGER_CURRENT_TEAMS="Current teams"
 COM_SPORTSMANAGER_PREVIOUS_TEAMS="Previous teams"
@@ -74,13 +77,13 @@ COM_SPORTSMANAGER_GAME="Game"
 COM_SPORTSMANAGER_GAMES="Games"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="G"
 COM_SPORTSMANAGER_ADD_PLAYER_STATISTICS="Add player statistics"
-COM_SPORTSMANAGER_PLAYER_STATISTICS="Player statistics"
+COM_SPORTSMANAGER_PLAYER_STATISTIC="Player statistics"
 COM_SPORTSMANAGER_COMPETITION="Competition"
 COM_SPORTSMANAGER_COMPETITIONS="Competitions"
 COM_SPORTSMANAGER_IN_COMPETITIONS="in competition"
 COM_SPORTSMANAGER_COMPETITIONS_SHORTCUT="C"
 COM_SPORTSMANAGER_DUPLICATE="Duplicate"
-COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Do you really want to remove the player statistics?"
+COM_SPORTSMANAGER_CONFIRM_REMOVE_PLAYER_STATISTICS="Do you really want to remove the player statistics?"
 COM_SPORTSMANAGER_LIVE_TICKER="Live ticker"
 COM_SPORTSMANAGER_PLACE="Place"
 COM_SPORTSMANAGER_TEAM="Team"
@@ -128,11 +131,14 @@ COM_SPORTSMANAGER_QUARTER_FINAL="Quarter final"
 COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT="1/4"
 COM_SPORTSMANAGER_ROUND_OF_16="Round of sixteen"
 COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT="1/8"
-COM_SPORTSMANAGER_ROUND_OF_32="Round of thiry-two"
+COM_SPORTSMANAGER_ROUND_OF_32="Round of thirty-two"
+COM_SPORTSMANAGER_ROUND_OF_32_ALT="Round of thirty-two"
 COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT="1/16"
 COM_SPORTSMANAGER_ROUND_OF_64="Round of sixty-four"
+COM_SPORTSMANAGER_ROUND_OF_64_ALT="Round of sixty-four"
 COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT="1/32"
 COM_SPORTSMANAGER_ROUND_OF_128="Round of 128"
+COM_SPORTSMANAGER_ROUND_OF_128_ALT="Round of 128"
 COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT="1/64"
 COM_SPORTSMANAGER_DAY_0_SHORTCUT="Su."
 COM_SPORTSMANAGER_DAY_1_SHORTCUT="Mo."
@@ -259,6 +265,7 @@ COM_SPORTSMANAGER_IN="in"
 COM_SPORTSMANAGER_NATIONAL="National"
 COM_SPORTSMANAGER_INTERNATIONAL="International"
 COM_SPORTSMANAGER_PLAYER_NUMBER_SHORT="Player number"
+COM_SPORTSMANAGER_ASSOCIATION_SHORT_NAME="Association short name"
 COM_SPORTSMANAGER_BASIC_PLAYER_NUMBER_SHORT="Player number base"
 COM_SPORTSMANAGER_MESSAGES="Registrations"
 COM_SPORTSMANAGER_TOURNAMENT_PLACEMENT="Tournament placements"
@@ -289,7 +296,6 @@ COM_SPORTSMANAGER_REQUEST_MESSAGE_PLURAL="At least %d dates must be given comple
 COM_SPORTSMANAGER_REJECT_SHIFT="Reject shift"
 COM_SPORTSMANAGER_TO="until"
 COM_SPORTSMANAGER_PLAYER_STATISTICS="Player statistics"
-COM_SPORTSMANAGER_PERFORMANCE_INDEX="Performance index"
 COM_SPORTSMANAGER_PERFORMANCE_INDEX_SHORTCUT="PI"
 COM_SPORTSMANAGER_WON="won"
 COM_SPORTSMANAGER_LOST="lost"
@@ -311,6 +317,11 @@ COM_SPORTSMANAGER_FOR_OTHER_CONTACT="For other contact"
 COM_SPORTSMANAGER_DATES_REGISTERED_USERS="Apply dates by registered users"
 COM_SPORTSMANAGER_VIEW_ELO_RATING="View Elo rating"
 COM_SPORTSMANAGER_VIEW_SPORTSMANAGER_LIZENZ="Show License"
+COM_SPORTSMANAGER_VIEW_LEAST_MEMBER_COUNT="Show least member count (teams)"
+COM_SPORTSMANAGER_SHOW_ORGANISATION="Show organisation (teams)"
+COM_SPORTSMANAGER_SHOW_MEMBER_COUNT="Show member column (teams)"
+COM_SPORTSMANAGER_SHOW_TOURNAMENT_BRACKET="Show Tournament Bracket"
+COM_SPORTSMANAGER_USE_DISCIPLINARY_FINE="Use disciplinary fine"
 COM_SPORTSMANAGER_PLAYER_DETAILS="Player details"
 COM_SPORTSMANAGER_PLAYER_LIST_DETAILS="Player list details"
 COM_SPORTSMANAGER_PLAYER_EDIT="Edit player data by organisation/club contacts"
@@ -351,8 +362,9 @@ COM_SPORTSMANAGER_PLAYERS_EXPORT_SPORT_SOFTWARE="Export players (Sport Software)
 COM_SPORTSMANAGER_CLEANUP_INACTIVE_PLAYERS="Cleanup inactive players"
 COM_SPORTSMANAGER_STATISTIK="Statistics"
 COM_SPORTSMANAGER_PLAYERS_ACTIVE="Players active"
-COM_SPORTSMANAGER_RESTRICTED_PLAYERS="Players restrited"
+COM_SPORTSMANAGER_RESTRICTED_PLAYERS="Players restricted"
 COM_SPORTSMANAGER_PLAYER_PASSIV="Players passive"
+COM_SPORTSMANAGER_PLAYER_UNATTACHED="Players unattached"
 COM_SPORTSMANAGER_MEN_ACTIVE="Male active"
 COM_SPORTSMANAGER_WOMEN_ACTIVE="Female active"
 COM_SPORTSMANAGER_JUNIOR_ACTIVE="Juniors active"
@@ -362,7 +374,7 @@ COM_SPORTSMANAGER_IDENTICAL_NAME="Identical name"
 COM_SPORTSMANAGER_IDENTICAL_NAME_BIRTHYEAR="Identical name and birth year"
 COM_SPORTSMANAGER_NO_PLAYERS="No player number"
 COM_SPORTSMANAGER_LAST_FIRST_NAME="Last name, first name"
-COM_SPORTSMANAGER_BIRTHYEAR="birthyear"
+COM_SPORTSMANAGER_BIRTHYEAR="Birthyear"
 COM_SPORTSMANAGER_NAT="Nat. #"
 COM_SPORTSMANAGER_INT="Intern. #"
 COM_SPORTSMANAGER_REMOVE_MESSAGE="Do you really want to remove the player?"
@@ -380,6 +392,7 @@ COM_SPORTSMANAGER_MEMBER_STATUS="Member status"
 COM_SPORTSMANAGER_ACTIVE="Active"
 COM_SPORTSMANAGER_RESTRICTED="Restricted"
 COM_SPORTSMANAGER_BEATEN="Excreted"
+COM_SPORTSMANAGER_HIDE="Hide"
 COM_SPORTSMANAGER_PASSIVE="Passive"
 COM_SPORTSMANAGER_BEATEN_CLUB="Club excreted"
 COM_SPORTSMANAGER_SINGLE_SEED="Elo starting value singles"
@@ -402,10 +415,11 @@ COM_SPORTSMANAGER_EXPORT="Export"
 COM_SPORTSMANAGER_INTERNATIONAL_PLAYERS="Players (international)"
 COM_SPORTSMANAGER_COUNTRY_CODE="Country code"
 COM_SPORTSMANAGER_IMPORT="Import"
-COM_SPORTSMANAGER_IMPORT_MESSAGE="In the import there are only player information about club %s present. Shall only the members of that one club be updated, the associated club has to be selected down here. If the import contains all members of the organisation then the organisation must be selected."
+COM_SPORTSMANAGER_IMPORT_MESSAGE="In the import there are only player information about club %s present. Shall only the members of that one club be updated, the associated club has to be selected down here. If the import contains all members of the organisation then the organisation must be selected.<br />If a license number already exists, the license number and the year of birth will not be overwritten."
 COM_SPORTSMANAGER_CHECK="Check"
-COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="There are conflicts in the import which have to be fixed manually first."
+COM_SPORTSMANAGER_IMPORT_CONFLICTS_MESSAGE="There are faults or conflicts in the import which have to be fixed manually first."
 COM_SPORTSMANAGER_IMPORT_DUPLICATE_MESSAGE="Attempt to change player number into one that is already assigned to another player."
+COM_SPORTSMANAGER_IMPORT_WRONG_FORMAT_PLAYERNUMBER="One or more player numbers contain an invalid format"
 COM_SPORTSMANAGER_NAME2="Name"
 COM_SPORTSMANAGER_DATA_IMPORT_ABORT_MESSAGE="The import has been aborted because there are conflicts in the containing player information. Please contact a moderator and attach the import!"
 COM_SPORTSMANAGER_DATA_IMPORT_NO_CONFLICTS="There are conflicts in the containing player information."
@@ -444,7 +458,7 @@ COM_SPORTSMANAGER_NOTE="Note"
 COM_SPORTSMANAGER_WANT_REALLY_REMOVE="Do you really want to remove the club?"
 COM_SPORTSMANAGER_ADD="Add"
 COM_SPORTSMANAGER_REMOVE_ACCOUNT="Remove account"
-COM_SPORTSMANAGER_DISTRICT="Ristrict"
+COM_SPORTSMANAGER_DISTRICT="District"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_TEAM="Eligible for team"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_CLUB="Eligible for club"
 COM_SPORTSMANAGER_SAVED_CLUB="Club to maintain"
@@ -502,7 +516,6 @@ COM_SPORTSMANAGER_ADD_POINTS_TABLE="Add points table"
 COM_SPORTSMANAGER_ADD_FUNCTION="Add function"
 COM_SPORTSMANAGER_PARTICIPANT="Participants"
 COM_SPORTSMANAGER_FUNCTION="Function"
-COM_SPORTSMANAGER_MULTIPLIER="Multiplier"
 COM_SPORTSMANAGER_MAXIMUM="maximum"
 COM_SPORTSMANAGER_CONTRACTION="Contraction"
 COM_SPORTSMANAGER_ELIGIBLE_ORGANIZERS="Eligible for organisation"
@@ -536,6 +549,7 @@ COM_SPORTSMANAGER_FULL_RATING="Full rating"
 COM_SPORTSMANAGER_NO_RATING="No rating"
 COM_SPORTSMANAGER_TEAM_COMPETITIONS="Team competitions"
 COM_SPORTSMANAGER_TABLE_SUMMARY="Table rating"
+COM_SPORTSMANAGER_HEAD_TO_HEAD_RECORD="Head-to-head record"
 COM_SPORTSMANAGER_POINTS_WON_LOST_DIFFERENCE="Game points won, game points lost, point difference"
 COM_SPORTSMANAGER_PERFORMANCE_INDEX="Performance index (GP+ * GP+ * 100) / (GP+ + GP-), game points won, ..."
 COM_SPORTSMANAGER_PERFORMANCE_INDEX2="Performance index (games * P+ * 10) / (P+ + P-), game points won, ..."
@@ -562,7 +576,7 @@ COM_SPORTSMANAGER_PRIVATE_PLAYER_DATA="View privat player information in club an
 COM_SPORTSMANAGER_ASSOCIATIONS_MEMBERSHIPS_MANAGE="Manage clubs and memberships"
 COM_SPORTSMANAGER_MANAGE_CLASSIFICATIONS="Manage classifications"
 COM_SPORTSMANAGER_MANAGE_TEAM_PLANS="Manage team plans"
-COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Manage postpone rules"
+COM_SPORTSMANAGER_MANAGE_RULES_POSTPONEMENT="Manage match rescheduling/postpone rules"
 COM_SPORTSMANAGER_MANAGE_VENUES="Manage venues"
 COM_SPORTSMANAGER_MANAGE_TEAM_COMPETITIONS="Manage team competitions"
 COM_SPORTSMANAGER_MANAGE_PLAYER_STATISTICS="Manage player statitics"
@@ -604,7 +618,10 @@ COM_SPORTSMANAGER_ONLY_DETAILED_RATING_POINT_DIFFERENCE="Only detailed ranking b
 COM_SPORTSMANAGER_ONLY_DETAILED_POINTS_AFTER_POINTSRATE="Only detailed ranking by points rate"
 COM_SPORTSMANAGER_KO_SIMPLE_FULL="K.O. (singles or full playout of all places)"
 COM_SPORTSMANAGER_MANUAL_PRO_TEAMS="Manual (per team)"
+COM_SPORTSMANAGER_CUP_DRAW_EVERY_ROUND="Cup: draw every round"
+COM_SPORTSMANAGER_CUP_USING_SEEDING_LIST="Cup: draw seeding list"
 COM_SPORTSMANAGER_SUBDIVISION="Subdivision"
+COM_SPORTSMANAGER_SHOW_MATCHDAY_TITLE="Show title matchday"
 COM_SPORTSMANAGER_ELO_RATING="Elo rating"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_EVENT="Eligibles for competition"
 COM_SPORTSMANAGER_TITLE_LOGO="Title logo"
@@ -632,6 +649,9 @@ COM_SPORTSMANAGER_GAMEDAY="Gameday"
 COM_SPORTSMANAGER_GAMEDAYS="Gamedays"
 COM_SPORTSMANAGER_ROUND="Round"
 COM_SPORTSMANAGER_ROUNDS="Rounds"
+COM_SPORTSMANAGER_ROUND_TITLE="Round Title"
+COM_SPORTSMANAGER_DRAW_FOR_HOME="Draw for home"
+COM_SPORTSMANAGER_MATCH_PLACE3="Match for place 3"
 COM_SPORTSMANAGER_MONTH="Month"
 COM_SPORTSMANAGER_MONTHS="Months"
 COM_SPORTSMANAGER_PLAYER_FROM_TEAM="Player of team"
@@ -647,8 +667,14 @@ COM_SPORTSMANAGER_SO_FAR="so far"
 COM_SPORTSMANAGER_PLACEMENT_AREA="Placement area"
 COM_SPORTSMANAGER_IMAGE_WITHIN_TEAM="Image within team"
 COM_SPORTSMANAGER_ADD_MEETING="Add match"
+COM_SPORTSMANAGER_GAMEDAY_GENERATION="Generate gameday"
 COM_SPORTSMANAGER_ROUND_GENERATION="Generate round"
+COM_SPORTSMANAGER_CUP_ROUND_GENERATION="Generate cup round"
 COM_SPORTSMANAGER_GENERATE_GROUP_GAME="Generate group games"
+COM_SPORTSMANAGER_Import_GROUP_GAME="Import group games"
+COM_SPORTSMANAGER_Import_GROUP_GAME2="Group games: Import"
+COM_SPORTSMANAGER_IMPORT_GROUP_GAME_IMPORTED="matches were imported"
+COM_SPORTSMANAGER_IMPORT_GROUP_GAME_CREATED="matches were created"
 COM_SPORTSMANAGER_REMOVE_ALL_ENCOUNTERS="Do you really want to remove all matches?"
 COM_SPORTSMANAGER_REMOVE_ALL_MATCHES="Remove all matches"
 COM_SPORTSMANAGER_HOME_TEAM="Home team"
@@ -694,6 +720,7 @@ COM_SPORTSMANAGER_NUMBER_DAYS="%d days"
 COM_SPORTSMANAGER_CALENDAR_WEEK="Calendar week"
 COM_SPORTSMANAGER_CALENDAR_WEEK_SHORTCUT="CW"
 COM_SPORTSMANAGER_PAIRING="Fixture"
+COM_SPORTSMANAGER_SETTING="Setting"
 COM_SPORTSMANAGER_PAIRINGS="Fixtures"
 COM_SPORTSMANAGER_INTERMITTENT="Skipping"
 COM_SPORTSMANAGER_MAXIMUM_SETS="Maximum sets"
@@ -770,6 +797,7 @@ COM_SPORTSMANAGER_FEDERAL_STATES="State"
 COM_SPORTSMANAGER_STATES="Countries"
 COM_SPORTSMANAGER_YEAR="Year"
 COM_SPORTSMANAGER_ADDITION="Addition"
+COM_SPORTSMANAGER_LOCATION="Location"
 COM_SPORTSMANAGER_STATE="Germany"
 COM_SPORTSMANAGER_FEDERAL_="Federal "
 COM_SPORTSMANAGER_INFO="Info"
@@ -783,7 +811,6 @@ COM_SPORTSMANAGER_APPLIED_FOR="Applied"
 COM_SPORTSMANAGER_DECLINED="Declined"
 COM_SPORTSMANAGER_DATE_DETAILS="Event: Details"
 COM_SPORTSMANAGER_ADDITIONS="Additions"
-COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Additional information"
 COM_SPORTSMANAGER_PUBLIC_EMAIL="E-mail public"
 COM_SPORTSMANAGER_EMAIL_WITH_CHANGES="E-mail for changes"
 COM_SPORTSMANAGER_ACTION_TYPE="Action type"
@@ -827,7 +854,6 @@ COM_SPORTSMANAGER_REMOVE_STATE_REALLY="Do you really want to remove the country?
 COM_SPORTSMANAGER_DATES_STATE="Appointments country"
 COM_SPORTSMANAGER_RENAME_APPOINTMENTS_STATE="Rename appointments with the preset country"
 COM_SPORTSMANAGER_FINAL_RANKING="FINAL RANKING"
-COM_SPORTSMANAGER_HOME_TEAM2="Home team"
 COM_SPORTSMANAGER_RESULTS2="Result"
 COM_SPORTSMANAGER_NO_GAMES="No games"
 COM_SPORTSMANAGER_END_GAME="Final"
@@ -860,6 +886,9 @@ COM_SPORTSMANAGER_INITIAL_APPOINTMENT_SUGGESTIONS="Initial appointment suggestio
 COM_SPORTSMANAGER_REQUESTING_TEAM="Requesting team"
 COM_SPORTSMANAGER_OPPONENT_TEAM="Opponent team"
 COM_SPORTSMANAGER_AGAINST_PROPOSALS_ALLOWED="Against proposals allowed"
+COM_SPORTSMANAGER_REASON_REQUIRED="Reason required"
+COM_SPORTSMANAGER_CLUB_ENTITLEMENT="Club entitlement"
+COM_SPORTSMANAGER_ASSOCIATION_ENTITLEMENT="Association_entitlement"
 COM_SPORTSMANAGER_LEAD_TIME="Lead time"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MINIMAL="Appointment proposals minimal"
 COM_SPORTSMANAGER_APPOINTMENT_PROPOSALS_MAXIMUM="Appointment proposals maximum"
@@ -869,6 +898,11 @@ COM_SPORTSMANAGER_OPTIONAL_BUT_SAME_IN_DOUBLES="Optional but both or none in dou
 COM_SPORTSMANAGER_REQUIRED="Required"
 COM_SPORTSMANAGER_RESULT_ONLY="Result only"
 COM_SPORTSMANAGER_GAME_NUMBER="Game %d"
+COM_SPORTSMANAGER_LABEL_GAME_NUMBER="Game nr"
+COM_SPORTSMANAGER_LABEL_GAME_TITLE="Gameday title"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES="Explicit Penalties"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_SUBJECT="%s: received penalty"
+COM_SPORTSMANAGER_EXPLICIT_PENALTIES_EMAIL_BODY="%s received a penalty of %f points based on the following justification: %s"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_SUBJECT="%s vs %s: Shift game appointment"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_BODY="For match %s versus %s on %s in %s the game appointment is shifted by %s.\n\nAlternative appointments:\n\n"
 COM_SPORTSMANAGER_EMAIL_SHIFT_GAME_APPOINTMENT_REQUESTED_BODY="For match %s on %s in %s the game appointment is shifted by %s.\n\nPlease propose alternative appointments under %s"
@@ -921,3 +955,147 @@ COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_MARK_NO=" (Kein Nichtraucherschutz)"
 COM_SPORTSMANAGER_POINTS_TABLE="Points table"
 COM_SPORTSMANAGER_EVALUATION="Auswertung"
 COM_SPORTSMANAGER_FUNCTION_DESCRIPTION="Variables: n = number of participants, p = place, m = multiplier of rating and in doubles possibly additionally reduced rating<br />Functions: +, -, *, /, round(x), pow(x), if(a > b, x, y), min(x, y), max(x, y), log(x), ln(x), logn(b, x)<br />VerteilungR(r, p, n, m) := max(round((((m * r - 1) * (-log(p / n) * (1 - (p / n)))) / (-log(1 / n) * (1 - (1 / n)))) + 1), 1)<br />Verteilung(r, p, n, m) := max(round(m * round((((r - 1) * (-log(p / n) * (1 - (p / n)))) / (-log(1 / n) * (1 - (1 / n)))) + 1)), 1)<br /><br />The functions VerteilungR() and Verteilung() distribute points for place 1 (r) descending to the individual places (p) of the number of participants (n).<br />VerteilungR() applies the multiplier (m) to the points for 1st place and then distributes down to 1 point for the last place.<br />Verteilung() applies the multiplier (m) to the points after the calculation, i.e. the last place receives 1 * m points."
+COM_SPORTSMANAGER_RANK="Rank"
+
+; Edit Player
+COM_SPORTSMANAGER_LIZENZ="License"
+COM_SPORTSMANAGER_ARIA_LABEL_MATCHDAY_SELECT="Choose a match day"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_DAY="Choose the day of the match proposal"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MONTH="Choose the month of the match proposal"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_YEAR="Choose the year of the match proposal"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_HOUR="Choose the hour of the match proposal"
+COM_SPORTSMANAGER_ARIA_LABEL_PROPOSAL_MINUTE="Choose the minute of the match proposal"
+COM_SPORTSMANAGER_ARIA_LABEL_SPECIAL_FILTER="Advanced Filter"
+COM_SPORTSMANAGER_ARIA_LABEL_PLACE="Location"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_CLUB="Choose eligible club"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_START_MONTH="Month of tournament start"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_START_YEAR="Year of tournament start"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_END_MONTH="Month of tournament end"
+COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_END_YEAR="Year of tournament end"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_USER="Choose eligible user"
+COM_SPORTSMANAGER_ARIA_LABEL_POINTS_GUEST="Points away"
+COM_SPORTSMANAGER_ARIA_LABEL_POINTS_HOME="Points home"
+COM_SPORTSMANAGER_ARIA_LABEL_PLAYER_GUEST="Player away"
+COM_SPORTSMANAGER_ARIA_LABEL_PLAYER_HOME="Player home"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MONTH="Choose a Month"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_YEAR="Choose a Year"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_HOUR="Choose an Hour"
+COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MINUTE="Choose a Minute"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_NUMBER_GUEST="Game away"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_NUMBER_HOME="Game home"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_LINK_DOUBLE="Game link double"
+COM_SPORTSMANAGER_ARIA_LABEL_GAME_LINK_SINGLE="Game link single"
+COM_SPORTSMANAGER_ARIA_LABEL_PLACEMENT_MIN="Placement min."
+COM_SPORTSMANAGER_ARIA_LABEL_PLACEMENT_MAX="Placement max."
+COM_SPORTSMANAGER_ARIA_LABEL_PARTICIPANT_MIN="Participant min."
+COM_SPORTSMANAGER_ARIA_LABEL_PARTICIPANT_MAX="Participant max."
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_START_MONTH="Month of ranking start"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_START_YEAR="Year of ranking start"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_END_MONTH="Month of ranking end"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_END_YEAR="Year of ranking end"
+COM_SPORTSMANAGER_ARIA_LABEL_MAXIMUM_EVALUATED_COUNT="Maximum number of evaluated participations"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_START_MONTH="Month of statistics start"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_START_YEAR="Year of statistics start"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_END_MONTH="Month of statistics end"
+COM_SPORTSMANAGER_ARIA_LABEL_STATISTICS_END_YEAR="Year of statistics end"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_ORGANIZER="Choose eligible organizer"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_START_MONTH="Month of event start"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_START_YEAR="Year of event start"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_END_MONTH="Month of event end"
+COM_SPORTSMANAGER_ARIA_LABEL_EVENT_END_YEAR="Year of event end"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRST_ROUND="First round"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRST_ROUND_TYPE="First round type"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRST_ROUND_PLACE="First round place"
+COM_SPORTSMANAGER_ARIA_LABEL_LAST_ROUND="Last round"
+COM_SPORTSMANAGER_ARIA_LABEL_LAST_ROUND_TYPE="Last round type"
+COM_SPORTSMANAGER_ARIA_LABEL_LAST_ROUND_PLACE="Last round place"
+COM_SPORTSMANAGER_ARIA_LABEL_ROUND_TYPE="round type"
+COM_SPORTSMANAGER_ARIA_LABEL_ROUND_PLACE="round place"
+COM_SPORTSMANAGER_HOME_POINTS="Home points"
+COM_SPORTSMANAGER_GUEST_POINTS="Guest points"
+COM_SPORTSMANAGER_ARIA_LABEL_ENCOUNTER_YEAR="Year of encounter"
+COM_SPORTSMANAGER_ARIA_LABEL_PAIRING_TEAM="Team for fixture"
+COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_COMPETITION="Choose eligible user"
+COM_SPORTSMANAGER_ARIA_LABEL_RANKING_EVALUATION="Ranking evaluation"
+COM_SPORTSMANAGER_ARIA_LABEL_LASTNAME="Lastname"
+COM_SPORTSMANAGER_ARIA_LABEL_FIRSTNAME="Firstname"
+COM_SPORTSMANAGER_ARIA_LABEL_CLUB="Club"
+COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS="Shifts"
+COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP="Game shifts caused by this team"
+COM_SPORTSMANAGER_GAME_RESULT_DELAYS="Delay"
+COM_SPORTSMANAGER_USE_EMAIL_REMINDERS="Use email reminders"
+COM_SPORTSMANAGER_RULEBOOKS="Rulebooks"
+COM_SPORTSMANAGER_RULEBOOK="Rulebook"
+COM_SPORTSMANAGER_RULE_SHORT="Rule"
+COM_SPORTSMANAGER_FEE_SHORT="Section fees"
+COM_SPORTSMANAGER_RULE_LONG="Section rules"
+COM_SPORTSMANAGER_FEE_LONG="Fee"
+COM_SPORTSMANAGER_SELECT="Select"
+COM_SPORTSMANAGER_NO_SELECT="No selection"
+COM_SPORTSMANAGER_REALLY_REMOVE_RULEBOOK="Do you really want to remove this rulebook?"
+COM_SPORTSMANAGER_ADD_RULEBOOK="Add rulebook"
+COM_SPORTSMANAGER_DISCIPLINARY_FINES="Disciplinary fines"
+COM_SPORTSMANAGER_ISSUE_DISCIPLINARY_FINES="Issue disciplinary fines"
+COM_SPORTSMANAGER_ISSUE_DISCIPLINARY_FINE="Issue disciplinary fine"
+COM_SPORTSMANAGER_EDIT_DISCIPLINARY_FINE="Edit issue disciplinary fine"
+COM_SPORTSMANAGER_SEND_DISCIPLINARY_FINE="Send issue disciplinary fine"
+COM_SPORTSMANAGER_REALLY_REMOVE_DISCIPLINARY_FINES="Do you really want to remove this Issue disciplinary fine?"
+COM_SPORTSMANAGER_VIOLATIONS="Violations"
+COM_SPORTSMANAGER_VIOLATION="Violation"
+COM_SPORTSMANAGER_ADD_VIOLATION="Add violation"
+COM_SPORTSMANAGER_REALLY_REMOVE_VIOLATION="Do you really want to remove this violation?"
+COM_SPORTSMANAGER_VIOLATION_TEXT="Text"
+COM_SPORTSMANAGER_VIOLATION_ADD_TEXT="Additional text"
+COM_SPORTSMANAGER_FEE="Fee"
+COM_SPORTSMANAGER_ADD_FEE="Additional Fee"
+COM_SPORTSMANAGER_SELECTABLE="Selectable"
+COM_SPORTSMANAGER_TEMPLATE="Template"
+COM_SPORTSMANAGER_EMAIL_SUBJECT="Subject"
+COM_SPORTSMANAGER_EMAIL_MESSAGE="Message"
+COM_SPORTSMANAGER_EMAIL_TO="to"
+COM_SPORTSMANAGER_EMAIL_SEND="Send E-Mail"
+COM_SPORTSMANAGER_EMAIL_TEXT_TEMPLATE="Text template"
+COM_SPORTSMANAGER_ISSUER="Issuer"
+COM_SPORTSMANAGER_SENDER="Sender"
+COM_SPORTSMANAGER_ISSUE_DATE="Issue date"
+COM_SPORTSMANAGER_BILL_ISSUER="Bill issuer"
+COM_SPORTSMANAGER_MULTIPLIER="Multiplier"
+COM_SPORTSMANAGER_ADDITIONAL_INFORMATION="Additional information"
+COM_SPORTSMANAGER_EMAIL_WAS_SEND="E-Mail was succesfully sent"
+COM_SPORTSMANAGER_EMAIL_WAS_NOT_SEND="E-Mail was not sent"
+COM_SPORTSMANAGER_OLD_DATE="Old Date"
+COM_SPORTSMANAGER_NEW_DATE="New Date"
+COM_SPORTSMANAGER_REASON_GAME_APPOINTMENT="Appointment reason"
+COM_SPORTSMANAGER_MATCH_RESCHEDULINGS="Match reschedulings"
+COM_SPORTSMANAGER_MATCH_RESCHEDULING="Match rescheduling"
+COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="If home advantage is swapped, enter the same date"
+COM_SPORTSMANAGER_NOT_VALID_TIME="Not valid time"
+COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Do you really want to remove this match rescheduling?"
+COM_SPORTSMANAGER_REST_DAYS="Rest days"
+COM_SPORTSMANAGER_TRAINING_DAYS="Training days"
+COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Data not updated"
+COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"
+COM_SPORTSMANAGER_ASSOCIATION_BODY="Association body"
+COM_SPORTSMANAGER_ADD_ASSOCIATION_BODY="Add association body"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY="Do you really want to remove this association body?"
+COM_SPORTSMANAGER_INVALID_ASSOCIATION_BODY_NAME="Invalid association body name"
+COM_SPORTSMANAGER_NAME_NOT_COMPLETE="The name is not completely filled in"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Additional information"
+COM_SPORTSMANAGER_USE_HTML="HTML-formatted text should be used here."
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER="Do you really want to remove this association body member?"
+COM_SPORTSMANAGER_HELP_EDIT_ASSOCIATION_BODY_MEMBER="Selecting a name from the player list will fill in the first and last name.<br>Phone, mobile, and email are filled from the player list if left blank here."
+COM_SPORTSMANAGER_HALL_OF_FAME="Hall of Fame"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME="Add Hall of Fame"
+COM_SPORTSMANAGER_INVALID_HALL_OF_FAME_NAME="Invalid Hall of Fame name"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME="Are you sure you want to delete this Hall of Fame including all its members?"
+COM_SPORTSMANAGER_MATCH_TYPE="Game Type"
+COM_SPORTSMANAGER_REALLY_REMOVE_HALL_OF_FAME_YEAR="Are you sure you want to delete this Hall of Fame year?"
+COM_SPORTSMANAGER_YEARS="Years"
+COM_SPORTSMANAGER_ADD_HALL_OF_FAME_YEAR="Add Hall of Fame Year"
+COM_SPORTSMANAGER_NO_ENTRY="no entry"
+COM_SPORTSMANAGER_REALLY_SWAP_MATCH="Do you really want to swap the home advantage?"
+COM_SPORTSMANAGER_SWAP_MATCH="Swap home advantage"
+COM_SPORTSMANAGER_REALLY_DELETE_MATCH_REPORT="The match report and all its history will be deleted. Are you sure you want to delete the match report?"
+COM_SPORTSMANAGER_MATCH_REPORT_DELETED="Match report deleted"
+COM_SPORTSMANAGER_MATCH_REPORT_WAS_DELETED="The match report has been successfully deleted!"
+COM_SPORTSMANAGER_MATCH_REPORT_CORRECTED="Match report corrected"

src/structure/sportsmanager.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE install SYSTEM "http://dev.joomla.org/xml/1.5/component-install.dtd">
+<extension type="component" version="5.0" method="upgrade">
-<extension type="component" version="3.0" method="upgrade">
   <name>Sports manager</name>
-  <creationDate>2020-09-30</creationDate>
+  <creationDate>2025-03-12</creationDate>
-  <author>Sven Nickel</author>
+  <author>Deutscher Tischfußball Verband</author>
-  <authorEmail>sven.nickel@gmail.com</authorEmail>
+  <authorEmail>it@dtfb.de</authorEmail>
   <copyright>All rights reserved</copyright>
   <license>GNU/GPL</license>
-  <version>1.7.1</version>
+  <version>DEV</version>
   <description>Verwaltung von Spielern und Vereinen in Mannschafts- und Individualwettbewerben</description>
+  <namespace path="src">Dtfb\Component\com_sportsmanager</namespace>
   <files folder="site">
     <filename>index.html</filename>
     <filename>admin.php</filename>
     <filename>api.php</filename>
-    <filename>controller.php</filename>
-    <filename>database.php</filename>
     <filename>sportsmanager.php</filename>
     <filename>mathparser.php</filename>
     <filename>tools.php</filename>
     <filename>js/jquery.min.js</filename>
+    <folder>database</folder>
     <folder>images</folder>
 		<folder>models</folder>
+		<folder>src</folder>
+    <folder>util</folder>
     <folder>views</folder>
   </files>
   <languages folder="site">
@@ -31,14 +32,15 @@
     <language tag="nl-NL">language/nl-NL/nl-NL.com_sportsmanager.ini
     </language>
   </languages>
-  <scriptfile>install.php</scriptfile>
+  <scriptfile>script.php</scriptfile>
   <administration>
     <files folder="admin">
       <filename>access.xml</filename>
-      <filename>sportsmanager.php</filename>
-      <filename>controller.php</filename>
       <filename>index.html</filename>
-			<folder>views</folder>
+      <filename>RELEASE_NOTES.md</filename>
+      <folder>services</folder>
+      <folder>src</folder>
+			<folder>tmpl</folder>
     </files>
     <languages folder="admin">
       <language tag="en-GB">language/en-GB/en-GB.com_sportsmanager.ini