Update readme

Calling non-static methods statically throws an Error since version 8 and is long deprecated.

https://www.php.net/manual/en/language.oop5.static.php

.github/release-drafter_extension.yml

@@ -1,25 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,81 +0,0 @@
-# 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: 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

@@ -1,39 +0,0 @@
-# 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

@@ -1,23 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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,89 +1,33 @@
 # SportsManager
 
-## DEV/STAGE environments
+## Deploy status
 
-| LV     | HOSTER   | DOMAIN                                                       | BRANCH               |
+### DEV environment
-| ------ | -------- | ------------------------------------------------------------ | -------------------- |
+[![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 environments
+### PROD environment
+[![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)
 
-| LV     | HOSTER   | DOMAIN                                           | BRANCH              |
+[![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)
-| ------ | -------- | ------------------------------------------------ | ------------------- |
-| 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
 
-## Test setup
+[get docker](https://docs.docker.com/get-docker/)
-### Installation
+[get node](https://nodejs.org/en/download/) for packaging
-To start joomla and the database, run
+### Vorbereitung der Entwicklungsumgebung durch Akeeba Backup Restore
 
-```shell
+- `docker compose up -d` ausführen und warten bis joomla auf [localhost:8080](localhost:8080) erreichbar ist
-   docker-compose up -d
+- im Verzeichnis [data/joomla_data/](data/joomla_data/) folgende Daten ablegen:
-```
+  - 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
 
-### Release creation
+### Komponenten verpacken
-To create a release execute 
-```shell
-    npm run release
-```
 
-### Deployment
+- Abhängigkeiten installieren via `npm i`.
-Deployment can only be done manually right now (sad)  
+- Paketierung beginnen mit `npm run package`
-To do this go to
+- Joomla Komponente ist nun hier fertig verpackt: [package/packages/com_sportsmanager.zip](package/packages/com_sportsmanager.zip)
-[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
-
-=======
- 
-Test

docker-compose.yml

@@ -1,43 +1,31 @@
+version: '2'
 services:
-  joomla:
+  mariadb:
-    image: joomla:5.2.4
+    image: docker.io/bitnami/mariadb:10.3
-    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:
-      MYSQL_DATABASE: joomla_db
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
-      MYSQL_USER: joomla
+      - ALLOW_EMPTY_PASSWORD=yes
-      MYSQL_PASSWORD: examplepass
+      - MARIADB_USER=bn_joomla
-      MYSQL_RANDOM_ROOT_PASSWORD: '1'
+      - MARIADB_DATABASE=bitnami_joomla
-      TZ: Europe/Berlin
+      - MARIADB_INITDB_SKIP_TZINFO=yes
     volumes:
-      - joomla_database:/var/lib/mysql
+      - './data/mariadb_data:/bitnami/mariadb'
-    networks:
+  joomla:
-      - joomla_network
+    build: docker/joomla
-
+    ports:
-networks:
+      - '8080:8080'
-  joomla_network:
+      - '8443:8443'
-volumes:
+    environment:
-  joomla_data:
+      - JOOMLA_DATABASE_HOST=mariadb
-  joomla_database:
+      - JOOMLA_DATABASE_PORT_NUMBER=3306
+      - 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

@@ -0,0 +1,4 @@
+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.
+; 2. The PHPRC environment variable. (As of PHP 5.2.0)
-; 3. A number of predefined registry keys on Windows
+; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
 ; 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.
-; https://php.net/configuration.file
+; http://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.
-; https://php.net/ini.sections
+; http://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-conscious applications. We
+; compatibility with older or less security conscience 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 = Off
+display_errors = On
 
 ; 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 = /usr/local/lib/php/extensions
+extension_dir = /opt/bitnami/php/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 = /tmp
+upload_tmp_dir = /opt/bitnami/php/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 = /tmp/session
+session.save_path = /opt/bitnami/php/var/run/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,10 +1334,12 @@ session.save_path = /tmp/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
@@ -1537,18 +1539,18 @@ session.sid_bits_per_character = 5
 ; Default Value: "1%"
 ; Development Value: "1%"
 ; Production Value: "1%"
-; https://php.net/session.upload-progress.freq
+; http://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
-; https://php.net/session.upload-progress.min-freq
+; http://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.
-; https://php.net/session.lazy-write
+; http://php.net/session.lazy-write
 ;session.lazy_write = On
 
 [Assertion]
@@ -1556,47 +1558,67 @@ 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!
+; 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)
-; (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
-; https://php.net/zend.assertions
+; http://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
-; https://php.net/com.typelib-file
+; http://php.net/com.typelib-file
 ;com.typelib_file =
 
 ; allow Distributed-COM calls
-; https://php.net/com.allow-dcom
+; http://php.net/com.allow-dcom
 ;com.allow_dcom = true
 
-; autoregister constants of a component's typelib on com_load()
+; autoregister constants of a component's typlib on com_load()
-; https://php.net/com.autoregister-typelib
+; http://php.net/com.autoregister-typelib
 ;com.autoregister_typelib = true
 
 ; register constants casesensitive
-; https://php.net/com.autoregister-casesensitive
+; http://php.net/com.autoregister-casesensitive
 ;com.autoregister_casesensitive = false
 
 ; show warnings on duplicate constant registrations
-; https://php.net/com.autoregister-verbose
+; http://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.
-; https://php.net/mbstring.language
+; http://php.net/mbstring.language
 ;mbstring.language = Japanese
 
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
@@ -1611,7 +1633,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
-; https://php.net/mbstring.http-input
+; http://php.net/mbstring.http-input
 ;mbstring.http_input =
 
 ; Use of this INI entry is deprecated, use global output_encoding instead.
@@ -1621,7 +1643,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.
-; https://php.net/mbstring.http-output
+; http://php.net/mbstring.http-output
 ;mbstring.http_output =
 
 ; enable automatic encoding translation according to
@@ -1629,40 +1651,54 @@ zend.assertions = -1
 ; converted to internal encoding by setting this to On.
 ; Note: Do _not_ use automatic encoding translation for
 ;       portable libs/applications.
-; https://php.net/mbstring.encoding-translation
+; http://php.net/mbstring.encoding-translation
 ;mbstring.encoding_translation = Off
 
 ; automatic encoding detection order.
 ; "auto" detect order is changed according to mbstring.language
-; https://php.net/mbstring.detect-order
+; http://php.net/mbstring.detect-order
 ;mbstring.detect_order = auto
 
 ; substitute_character used when character cannot be converted
 ; one from another
-; https://php.net/mbstring.substitute-character
+; http://php.net/mbstring.substitute-character
 ;mbstring.substitute_character = none
 
-; Enable strict encoding detection.
+; overload(replace) single byte functions by mbstring functions.
-;mbstring.strict_detection = Off
+; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
+; 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_mimetypes=^(text/|application/xhtml\+xml)
+; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
-;mbstring.http_output_conv_mimetypes=
+;mbstring.http_output_conv_mimetype=
 
 ; 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
-; https://php.net/gd.jpeg-ignore-warning
+; http://php.net/gd.jpeg-ignore-warning
 ;gd.jpeg_ignore_warning = 1
 
 [exif]
@@ -1670,48 +1706,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 must not be empty.
+; intel byte order. A decode setting cannot be empty.
-; https://php.net/exif.encode-unicode
+; http://php.net/exif.encode-unicode
 ;exif.encode_unicode = ISO-8859-15
 
-; https://php.net/exif.decode-unicode-motorola
+; http://php.net/exif.decode-unicode-motorola
 ;exif.decode_unicode_motorola = UCS-2BE
 
-; https://php.net/exif.decode-unicode-intel
+; http://php.net/exif.decode-unicode-intel
 ;exif.decode_unicode_intel    = UCS-2LE
 
-; https://php.net/exif.encode-jis
+; http://php.net/exif.encode-jis
 ;exif.encode_jis =
 
-; https://php.net/exif.decode-jis-motorola
+; http://php.net/exif.decode-jis-motorola
 ;exif.decode_jis_motorola = JIS
 
-; https://php.net/exif.decode-jis-intel
+; http://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
-; https://php.net/tidy.default-config
+; http://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
-; https://php.net/tidy.clean-output
+; http://php.net/tidy.clean-output
 tidy.clean_output = Off
 
 [soap]
 ; Enables or disables WSDL caching feature.
-; https://php.net/soap.wsdl-cache-enabled
+; http://php.net/soap.wsdl-cache-enabled
 soap.wsdl_cache_enabled=1
 
 ; Sets the directory name where SOAP extension will put cache files.
-; https://php.net/soap.wsdl-cache-dir
+; http://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.
-; https://php.net/soap.wsdl-cache-ttl
+; http://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)
@@ -1770,11 +1806,6 @@ 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
 
@@ -1796,6 +1827,10 @@ 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
@@ -1833,16 +1868,7 @@ 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 = /tmp/opcache_file
+opcache.file_cache = /opt/bitnami/php/var/run/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
@@ -1856,13 +1882,8 @@ opcache.file_cache = /tmp/opcache_file
 ;opcache.file_cache_fallback=1
 
 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; Under certain circumstances (if only a single global PHP process is
+; This should improve performance, but requires appropriate OS configuration.
-; started from which all others fork), this can increase performance
+;opcache.huge_code_pages=1
-; 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
@@ -1876,12 +1897,12 @@ opcache.file_cache = /tmp/opcache_file
 
 ; Specifies a PHP script that is going to be compiled and executed at server
 ; start-up.
-; https://php.net/opcache.preload
+; http://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.
-; https://php.net/opcache.preload_user
+; http://php.net/opcache.preload_user
 ;opcache.preload_user=
 
 ; Prevents caching files that are less than this number of seconds old. It
@@ -1924,12 +1945,44 @@ opcache.file_cache = /tmp/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
 
-zend_extension=xdebug.so
+;[XDebug]
+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.start_with_request=yes
+xdebug.client_port=9000
 xdebug.client_host=host.docker.internal
-xdebug.client_port=9003
+xdebug.remote_handler=dbgp
-xdebug.log=/tmp/xdebug.log
+;xdebug.remote_host=host.docker.internal
-xdebug.discover_client_host=false
+;xdebug.remote_port=9000
-xdebug.log_level=7
+xdebug.start_with_request=yes
+xdebug.discover_client_host=0
+xdebug.idekey=PHPSTORM
+xdebug.show_error_trace = 1
+xdebug.max_nesting_level=250
+xdebug.var_display_max_depth=10
+;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: ['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}'],
+      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}'],
       replacesrc: ['src/structure/**/**.{php,html,xml,ini,less,json,js,css}', 'src/structure/**/.*.{php,html,xml,ini,less,json,js,css}'],
       dest: 'releasefiles/'
     },
@@ -59,28 +59,16 @@ 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/language/**/**',
+      src: './releasefiles/administrator/components/com_sportsmanager/sportsmanager.xml',
-      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/script.php',
+      src: './releasefiles/administrator/components/com_sportsmanager/script.php',
       dest: 'sourcefiles/com_sportsmanager/'
     },
     {
@@ -90,10 +78,6 @@ 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": "2.0.0",
+  "version": "0.0.1",
   "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": "https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git"
+    "url": "git+https://github.com/nielsnuebel/com_sportsmanager.git"
   },
   "keywords": [],
   "author": {
@@ -51,9 +51,9 @@
     "[PLUGINTYPE]": "system"
   },
   "casesensitive": {
-    "joomlaboilerplate": "kickboilerplate",
+    "joomlaboilerplate": "sportsmanager",
-    "JoomlaBoilerplate": "KickBoilerPlate",
+    "JoomlaBoilerplate": "SportsManager",
-    "JOOMLABOILERPLATE": "KICKBOILERPLATE"
+    "JOOMLABOILERPLATE": "SPORTSMANAGER"
   },
   "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/kickboilerplate"
+        "dest": "src/structure/plugins/system/sportsmanager"
       },
       {
         "src": [

src/database/updates.sql

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

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

@@ -0,0 +1,23 @@
+<?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

@@ -0,0 +1,31 @@
+<?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

@@ -1,61 +0,0 @@
-<?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

@@ -0,0 +1,19 @@
+<?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/sportsmanager.xml

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

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

@@ -1,19 +0,0 @@
-<?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

@@ -1,14 +0,0 @@
-<?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

@@ -1,40 +0,0 @@
-<?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

@@ -0,0 +1,5 @@
+[.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

@@ -0,0 +1,5 @@
+[.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

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

src/structure/administrator/components/com_sportsmanager/views/sportsmanager/tmpl/default.php

@@ -1,8 +1,8 @@
-<?php 
+<?php 
-/*
+/*
- * Sports Manager (C) 2006-2020, Sven Nickel
+ * Sports Manager (C) 2006-2020, Sven Nickel
- */
+ */
-
+
-// No direct access to this file
+// No direct access to this file
-defined('_JEXEC') or die('Restricted access'); 
+defined('_JEXEC') or die('Restricted access'); 
-
+

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

@@ -0,0 +1,5 @@
+[.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

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

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

@@ -0,0 +1,49 @@
+<?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/components/com_sportsmanager/api.php

@@ -2,99 +2,79 @@
 /*
  * Sports Manager API Extension
  */
+defined('_JEXEC') or die();
 
-use JetBrains\PhpStorm\NoReturn;
+$secret = JFactory::$config['secret'];
-use Joomla\CMS\Application\AdministratorApplication;
-use Joomla\CMS\Application\SiteApplication;
-use Joomla\CMS\Factory;
-use Joomla\CMS\User\UserFactory;
-use Joomla\CMS\User\UserFactoryInterface;
-use Joomla\Registry\Registry;
 
-defined("_JEXEC") or die();
+function abortWithError($error) {
-
+	if (isJson()) {
-require_once JPATH_SITE . '/components/com_sportsmanager/database/init.php';
+		header('content-type: application/json');
-
+		die(json_encode(['error' => $error]));
-Factory::getContainer()->set(Registry::class, function () {
+	} else {
-    return new Registry();
+		die($error);
-});
+	}
-
-$secret = Factory::getContainer()->get(Registry::class)->get("secret");
-
-#[NoReturn] function abortWithError($error): void
-{
-    if (isJson()) {
-        header("content-type: application/json");
-        die(json_encode(["error" => $error]));
-    } else {
-        die($error);
-    }
 }
 
-function isJson(): bool
+function isJson() {
-{
+  $jinput = JFactory::getApplication()->input;
-    $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
+
-    return $jInput->get('format') === 'json';
+  return $jinput->get('format') === 'json';
 }
 
-function notifyChange($data): void
+function notifyChange($data) {
-{
 
-    try {
+  try {
-        $db = getDatabase();
+	$db = &getDatabase();
-        $query = "SELECT wert from #__sportsmanager_einstellungen WHERE name='api_push_key'";
+	$query = "SELECT wert from #__sportsmanager_einstellungen WHERE name='api_push_key'";
-        $db->setQuery($query);
+	$db->setQuery($query);
-        $push_key = $db->loadResult();
+	$push_key = $db->loadResult();
-        $push_server = !empty($push_key) && isset(_payload($push_key)->aud) ? _payload($push_key)->aud : '';
+	$push_server = !empty($push_key) && isset(_payload($push_key)->aud) ? _payload($push_key)->aud : '';
-        if ($push_server != '' && $push_key != '') {
+	if ($push_server != '' && $push_key != '') {
-            $url = $push_server . (str_ends_with($push_server, '/') ? '' : '/') . 'v1/notifications/send';
+		$url = $push_server . (substr($push_server, -1) == '/' ? '' : '/') . 'v1/notifications/send';
-            $key = 'key=' . $push_key;
+		$key = 'key=' . $push_key;
 
-            $ch = curl_init($url);
+        $ch = curl_init($url);
-            curl_setopt_array($ch, array(
+        curl_setopt_array($ch, array(
-                CURLOPT_POST => TRUE,
+            CURLOPT_POST => TRUE,
-                CURLOPT_RETURNTRANSFER => TRUE,
+            CURLOPT_RETURNTRANSFER => TRUE,
-                CURLOPT_HEADER => TRUE,
+            CURLOPT_HEADER => TRUE,
-                CURLOPT_HTTPHEADER => array(
+            CURLOPT_HTTPHEADER => array(
-                    'Authorization: ' . $key,
+                'Authorization: ' . $key,
-                    'Content-Type: application/json',
+                'Content-Type: application/json',
-                ),
+            ),
-                CURLOPT_TIMEOUT => 2,
+            CURLOPT_TIMEOUT => 2,
-                CURLOPT_POSTFIELDS => json_encode($data),
+            CURLOPT_POSTFIELDS => json_encode($data),
-            ));
+        ));
-            $resp = curl_exec($ch);
+        $resp = curl_exec($ch);
-            if (!$resp) {
+        if ($resp == FALSE) {
-                error_log("failed to send notification");
+            error_log("failed to send notification");
-            }
         }
-    } catch (Exception $ex) {
+	}
-        error_log($ex);
+  } catch (Exception $ex) {
-    }
+      error_log($ex);
+  }
 }
 
-function begegnungChanged($begegnung, $begegnung_vorher, $modus, $heim_team, $gast_team, $spiele): void
+function begegnungChanged($begegnung, $begegnung_vorher, $modus, $heim_team, $gast_team, $spiele) {
-{
+  notifyChange(['payload' => [
-    notifyChange(['payload' => [
+    'begegnung' => $begegnung,
-        'begegnung' => $begegnung,
+    'begegnung_vorher' => $begegnung_vorher,
-        'begegnung_vorher' => $begegnung_vorher,
+    '$modus' => $modus,
-        '$modus' => $modus,
+    'heim_team' => $heim_team,
-        'heim_team' => $heim_team,
+    'gast_team' => $gast_team,
-        'gast_team' => $gast_team,
+    'spiele' => $spiele,
-        'spiele' => $spiele,
+  ], 'type' => 'FIXTURE_RESULT_CHANGED']);
-    ], 'type' => 'FIXTURE_RESULT_CHANGED']);
 }
 
-function begegnungTischChanged($begegnung, $heim_team, $gast_team): void
+function begegnungTischChanged($begegnung, $heim_team, $gast_team) {
-{
+  notifyChange(['payload' => [
-    notifyChange(['payload' => [
+    'begegnung' => $begegnung,
-        'begegnung' => $begegnung,
+		'heim_team' => $heim_team,
-        'heim_team' => $heim_team,
+    'gast_team' => $gast_team,
-        'gast_team' => $gast_team,
+  ], 'type' => 'TABLE_CHANGED']);
-    ], 'type' => 'TABLE_CHANGED']);
 }
 
-function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $heim_team, $gast_team): void
+function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $heim_team, $gast_team) {
-{
     notifyChange([
         'payload' => [
             'begegnung' => $begegnung,
@@ -112,50 +92,41 @@ 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}
  */
-#[NoReturn] function userToken(): void
+function userToken() {
-{
     global $secret;
-    if (!isJson()) {
+	if (!isJson()) {
-        abortWithError("JSON Request only");
+		abortWithError("JSON Request only");
+	}
+	if (isExternalDatabase()) {
+	    abortWithError("Local Database only");
     }
-    if (isExternalDatabase()) {
+	$jinput = JFactory::getApplication()->input->json;
-        abortWithError("Local Database only");
+	$access_key = $jinput->getString('access_key');
+
+	$user_id = _payload($access_key)->sub;
+	$user = JFactory::getUser($user_id);
+
+	if (!jwt_validate($access_key, $secret.$user->password)) {
+		abortWithError('Access Key is invalid');
+	}
+
+	$expires =  new DateTime();
+	$expires->modify('+16 hours');
+    $db = &getDatabase();
+    $query = "SELECT berechtigt_team_id from #__sportsmanager_berechtigt_fuer_team where berechtigt_user_id = $user_id";
+    $db->setQuery($query);
+    if (!$db->execute()) {
+        abortWithError($db->stderr(true));
     }
-    $container = Factory::getContainer();
+    $team_id = $db->loadObjectList();
-    $jInput = $container->get(SiteApplication::class)->input->json;
+	JSON_sportsmanager::JSON([
-    $access_key = $jInput->getString('access_key');
+		'token' => jwt_token([
-
+		    'sub' => $user_id,
-    $user_id = _payload($access_key)->sub;
+            'exp' => $expires->getTimestamp(),
-    $user = $container->get(UserFactoryInterface::class)->loadUserById($user_id);
+        ], $secret),
-
+		'access_for_teams' => array_map(function($item) { return $item->berechtigt_team_id; }, $team_id),
-    if (!jwt_validate($access_key, $secret . $user->password)) {
+        'expires' => $expires->getTimestamp() * 1000, //
-        abortWithError('Access Key is invalid');
+	]);
-    }
-
-    try {
-        $expires = new DateTime();
-        $expires->modify('+16 hours');
-        $db = getDatabase();
-        $query = "SELECT berechtigt_team_id from #__sportsmanager_berechtigt_fuer_team where berechtigt_user_id = $user_id";
-        $db->setQuery($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),
-            'expires' => $expires->getTimestamp() * 1000, //
-        ]);
-    } catch (Exception $ex) {
-        error_log($ex);
-    }
-
 }
 
 /*
@@ -163,134 +134,124 @@ function begegnungVerlegenNotify($begegnung, $users, $vorschlagendes_team_id, $h
  * @response body
  * { data: { token: "api_acccess_token" }}
  */
-#[NoReturn] function userAuth(): void
+function userAuth() {
-{
     global $secret;
-    if (!isJson()) {
+	if (!isJson()) {
-        die();
+		die();
+	}
+	if (isExternalDatabase()) {
+	    abortWithError("Local Database only");
     }
-    if (isExternalDatabase()) {
+	$jinput = JFactory::getApplication()->input->json;
-        abortWithError("Local Database only");
+	$username = $jinput->getString('username');
-    }
+	$password = $jinput->getString('password');
-    $container = Factory::getContainer();
-    $jInput = $container->get(SiteApplication::class)->input->json;
-    $username = $jInput->getString('username');
-    $password = $jInput->getString('password');
 
-    $db = getDatabase();
+    $db = &getDatabase();
-    $query = $db->getQuery(true);
+	$query = $db->getQuery(true);
-    $query->select('id')->from('#__users')->where('username = "' . $username . '"')->setLimit(1);
+	$query->select('id')->from('#__users')->where('username = "' . $username . '"')->limit(1);
-    $db->setQuery($query);
+	$db->setQuery($query);
-    $user_id = $db->loadResult();
+	$user_id = $db->loadResult();
-    $user = $container->get(UserFactoryInterface::class)->loadUserById($user_id);
+	$user = JFactory::getUser($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 (JUserHelper::verifyPassword($password, $user->password, $user->id)) {
-    if (password_verify($password, $user->password)) {
 
-        JSON_sportsmanager::JSON([
+		JSON_sportsmanager::JSON([
-            'token' => jwt_token([
+			'token' => jwt_token([
-                'sub' => $user_id,
+				'sub' => $user_id,
-                'iat' => (new DateTime())->getTimestamp(),
+				'iat' => (new DateTime())->getTimestamp(),
-            ], $secret . $user->password)
+			], $secret.$user->password)
-        ]);
+		]);
-    }
+		return;
-    abortWithError('Wrong credentials');
+	}
+	abortWithError('Wrong credentials');
 }
 
-function getUserID(): int
+function getUserID() {
-{
     global $secret;
-    $container = Factory::getContainer();
+	$token = JFactory::getApplication()->input->server->getString('HTTP_SECRET', NULL);
-    $input = $container->get(SiteApplication::class)->input;
-    $token = $input->server->getString('HTTP_SECRET', NULL);
 
-    return $token != NULL && jwt_validate($token, $secret) && isset(_payload($token)->sub)
+	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 ($image != NULL) {
 
-        if (str_contains($image, '.png')) {
+		if (strpos($image, '.png') !== false) {
-            $img = imagecreatefrompng($image);
+			$img = imagecreatefrompng($image);
-        } else {
+		} else {
-            $img = imagecreatefromjpeg($image);
+			$img = imagecreatefromjpeg($image);
-        }
+		}
-        $width = imagesx($img);
+		$width = imagesx($img);
-        $height = imagesx($img);
+		$height = imagesx($img);
-        $colorMap = [];
+		$colorMap = [];
-        $colors = [];
+		$colors = [];
-        for ($x = 0; $x < $width; $x++) {
+		for ($x = 0; $x < $width; $x++) {
-            for ($y = 0; $y < $height; $y++) {
+			for ($y = 0; $y < $height; $y++) {
-                $color = imagecolorsforindex($img, imagecolorat($img, $x, $y));
+				$color = imagecolorsforindex($img, imagecolorat($img, $x, $y));
-                if ($color['alpha'] < 20) {
+				if ($color['alpha'] < 20) {
-                    $c = colorKey($color);
+					$c = colorKey($color);
-                    $hex = hex($color);
+					$hex = hex($color);
-                    if ($hex != NULL) {
+					if ($hex != NULL) {
-                        if (!isset($colors[$c])) {
+						if (!isset($colors[$c])) {
-                            $colors[$c] = 0;
+							$colors[$c] = 0;
-                            $colorMap[$c] = $hex;
+							$colorMap[$c] = $hex;
-                        }
+						}
-                        $colors[$c] += 1;
+						$colors[$c] += 1;
-                    }
+					}
-                }
+				}
-            }
+			}
-        }
+		}
-        arsort($colors);
+		arsort($colors);
-        $result = array_keys($colors);
+		$result = array_keys($colors);
-        return sizeof($result) > 1 && $result[0] === '0-0-0' ? $colorMap[$result[1]] : $colorMap[$result[0]];
+		return sizeof($result) > 1 && $result[0] === '0-0-0' ? $colorMap[$result[1]] : $colorMap[$result[0]];
-    }
+	}
-    return NULL;
+	return NULL;
 }
 
-function colorKey($rgb): string
+function colorKey($rgb) {
-{
 
-    $r = (int)($rgb['red'] / 100);
+	$r = (int)($rgb['red'] / 100);
-    $g = (int)($rgb['green'] / 100);
+	$g = (int)($rgb['green'] / 100);
-    $b = (int)($rgb['blue'] / 100);
+	$b = (int)($rgb['blue'] / 100);
 
-    return $r . '-' . $g . '-' . $b;
+	return $r . '-' . $g . '-' . $b;
 }
 
-function hex($rgb): ?string
+function hex($rgb) {
-{
+	$r = $rgb['red'];
-    $r = $rgb['red'];
+	$g = $rgb['green'];
-    $g = $rgb['green'];
+	$b = $rgb['blue'];
-    $b = $rgb['blue'];
+	if (($r + $g + $b) / 3 > 125) {
-    if (($r + $g + $b) / 3 > 125) {
+		return NULL;
-        return NULL;
+	}
-    }
+	$r = dechex($r);
-    $r = dechex($r);
+	if (strlen($r) < 2) {
-    if (strlen($r) < 2) {
+		$r = '0' . $r;
-        $r = '0' . $r;
+	}
-    }
+	$g = dechex($g);
-    $g = dechex($g);
+	if (strlen($g) < 2) {
-    if (strlen($g) < 2) {
+		$g = '0' . $g;
-        $g = '0' . $g;
+	}
-    }
+	$b = dechex($b);
-    $b = dechex($b);
+	if (strlen($b) < 2) {
-    if (strlen($b) < 2) {
+		$b = '0' . $b;
-        $b = '0' . $b;
+	}
-    }
+	return '#' . $r . $g . $b;
-    return '#' . $r . $g . $b;
 }
 
 /*
  * sign string with secret
  */
-function _sign($data, $secret): string
+function _sign($data, $secret, $algo = 'sha256') {
-{
     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]));
 }
@@ -298,8 +259,7 @@ function _payload($token)
 /*
  * headless signed jwt token
  */
-function jwt_token($payload, $secret): string
+function jwt_token($payload, $secret) {
-{
     $data = base64_encode(json_encode($payload));
 
     return $data . '.' . _sign($data, $secret);
@@ -308,8 +268,7 @@ function jwt_token($payload, $secret): string
 /*
  * validate token
  */
-function jwt_validate($token, $secret): bool
+function jwt_validate($token, $secret) {
-{
     $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

@@ -0,0 +1,24 @@
+<?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

@@ -1,120 +0,0 @@
-<?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;
-
-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";
-    $sportsmanager_database_local->setQuery($query);
-    if (!$sportsmanager_database_local->execute()) {
-        die($sportsmanager_database_local->stderr(true));
-    }
-    $rows = $sportsmanager_database_local->loadObjectList();
-
-    $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 {
-            $query = "SELECT wert FROM #__sportsmanager_einstellungen WHERE name = 'datenbank_version'";
-            $sportsmanager_database_external->setQuery($query);
-            try {
-                if (!$sportsmanager_database_external->execute()) {
-                    echo "<strong>" . Text::_('COM_SPORTSMANAGER_EXTERNAL_DB_NO_SM_TABLES') . "</strong><br><br>";
-                    $sportsmanager_database_external = NULL;
-                } else {
-                    $db_version = $sportsmanager_database_external->loadResult();
-                    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/images/desktop.ini

@@ -0,0 +1,5 @@
+[.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

@@ -0,0 +1,5 @@
+[.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

@@ -1,45 +0,0 @@
-<?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,417 +4,390 @@
  */
 
 // 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\User\User;
-use Joomla\CMS\Version;
-
 defined('_JEXEC') or die('Restricted access');
 
-require_once JPATH_SITE . '/components/com_sportsmanager/mathparser.php';
+require_once (JPATH_COMPONENT.DIRECTORY_SEPARATOR.'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);
+	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);
+	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
-    // 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);
-        }
-    }
 }
 
-#[NoReturn] function keinZugriff($login = FALSE): void
+function keinZugriff($login = FALSE) {
-{
+	if (isJson()) {
-    if (isJson()) {
+		abortWithError(401 . ' Unauthorized');
-        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();
-    $joomla = $version->getShortVersion();
+	$u =& JFactory::getURI();
-    $u = Uri::getInstance();
+	$redirectUrl = urlencode(base64_encode($u->toString()));
-    $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;
-    $finalUrl = $joomlaLoginUrl . $redirectUrl;
+	$app = &JFactory::getApplication();
-    $app = Factory::getContainer()->get(SiteApplication::class);
+	$app->redirect(JRoute::_($finalUrl));
-    $app->redirect(Route::_($finalUrl));
+	jexit();
-    jexit();
 }
 
-function bereinigterDateiname($dateiname): array|string
+function bereinigterDateiname($dateiname) {
-{
+	$_convertTable = array(
-    $_convertTable = array(
+		'&' => 'and',   '@' => 'at',    '©' => 'c', '®' => 'r', 'À' => 'a',
-        '&' => 'and', '@' => 'at', '©' => 'c', '®' => 'r', 'À' => 'a',
+		'Á' => 'a', 'Â' => 'a', 'Ä' => 'a', 'Å' => 'a', 'Æ' => 'ae','Ç' => 'c',
-        'Á' => 'a', 'Â' => 'a', 'Ä' => 'a', 'Å' => 'a', 'Æ' => 'ae', 'Ç' => 'c',
+		'È' => 'e', 'É' => 'e', 'Ë' => 'e', 'Ì' => 'i', 'Í' => 'i', 'Î' => 'i',
-        'È' => 'e', 'É' => 'e', 'Ë' => 'e', 'Ì' => 'i', 'Í' => 'i', 'Î' => 'i',
+		'Ï' => 'i', 'Ò' => 'o', 'Ó' => 'o', 'Ô' => 'o', 'Õ' => 'o', 'Ö' => 'o',
-        'Ï' => 'i', 'Ò' => 'o', 'Ó' => 'o', 'Ô' => 'o', 'Õ' => 'o', 'Ö' => 'o',
+		'Ø' => 'o', 'Ù' => 'u', 'Ú' => 'u', 'Û' => 'u', 'Ü' => 'u', 'Ý' => 'y',
-        'Ø' => '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',
-        'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ò' => 'o', 'ó' => 'o',
+		'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o', 'ù' => 'u', 'ú' => 'u',
-        'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o', 'ù' => 'u', 'ú' => 'u',
+		'û' => 'u', 'ü' => 'u', 'ý' => 'y', 'þ' => 'p', 'ÿ' => 'y', 'Ā' => 'a',
-        'û' => 'u', 'ü' => 'u', 'ý' => 'y', 'þ' => 'p', 'ÿ' => 'y', 'Ā' => 'a',
+		'ā' => 'a', 'Ă' => 'a', 'ă' => 'a', 'Ą' => 'a', 'ą' => 'a', 'Ć' => 'c',
-        'ā' => 'a', 'Ă' => 'a', 'ă' => 'a', 'Ą' => 'a', 'ą' => 'a', 'Ć' => 'c',
+		'ć' => 'c', 'Ĉ' => 'c', 'ĉ' => 'c', 'Ċ' => 'c', 'ċ' => 'c', 'Č' => 'c',
-        'ć' => 'c', 'Ĉ' => 'c', 'ĉ' => 'c', 'Ċ' => 'c', 'ċ' => 'c', 'Č' => 'c',
+		'č' => 'c', 'Ď' => 'd', 'ď' => 'd', 'Đ' => 'd', 'đ' => 'd', 'Ē' => 'e',
-        'č' => 'c', 'Ď' => 'd', 'ď' => 'd', 'Đ' => 'd', 'đ' => 'd', 'Ē' => 'e',
+		'ē' => 'e', 'Ĕ' => 'e', 'ĕ' => 'e', 'Ė' => 'e', 'ė' => 'e', 'Ę' => 'e',
-        'ē' => 'e', 'Ĕ' => 'e', 'ĕ' => 'e', 'Ė' => 'e', 'ė' => 'e', 'Ę' => 'e',
+		'ę' => 'e', 'Ě' => 'e', 'ě' => 'e', 'Ĝ' => 'g', 'ĝ' => 'g', 'Ğ' => 'g',
-        'ę' => 'e', 'Ě' => 'e', 'ě' => 'e', 'Ĝ' => 'g', 'ĝ' => 'g', 'Ğ' => 'g',
+		'ğ' => 'g', 'Ġ' => 'g', 'ġ' => 'g', 'Ģ' => 'g', 'ģ' => 'g', 'Ĥ' => 'h',
-        'ğ' => 'g', 'Ġ' => 'g', 'ġ' => 'g', 'Ģ' => 'g', 'ģ' => 'g', 'Ĥ' => 'h',
+		'ĥ' => 'h', 'Ħ' => 'h', 'ħ' => 'h', 'Ĩ' => 'i', 'ĩ' => 'i', 'Ī' => 'i',
-        'ĥ' => 'h', 'Ħ' => 'h', 'ħ' => 'h', 'Ĩ' => 'i', 'ĩ' => 'i', 'Ī' => 'i',
+		'ī' => 'i', 'Ĭ' => 'i', 'ĭ' => 'i', 'Į' => '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',
-        'ķ' => 'k', 'ĸ' => 'k', 'Ĺ' => 'l', 'ĺ' => 'l', 'Ļ' => 'l', 'ļ' => 'l',
+		'Ľ' => 'l', 'ľ' => 'l', 'Ŀ' => 'l', 'ŀ' => 'l', 'Ł' => 'l', 'ł' => 'l',
-        'Ľ' => 'l', 'ľ' => 'l', 'Ŀ' => 'l', 'ŀ' => 'l', 'Ł' => 'l', 'ł' => 'l',
+		'Ń' => 'n', 'ń' => 'n', 'Ņ' => 'n', 'ņ' => 'n', 'Ň' => 'n', 'ň' => 'n',
-        'Ń' => 'n', 'ń' => 'n', 'Ņ' => 'n', 'ņ' => 'n', 'Ň' => 'n', 'ň' => 'n',
+		'ʼn' => 'n', 'Ŋ' => 'n', 'ŋ' => 'n', 'Ō' => 'o', 'ō' => 'o', 'Ŏ' => 'o',
-        'ʼ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',
-        'ŕ' => 'r', 'Ŗ' => 'r', 'ŗ' => 'r', 'Ř' => 'r', 'ř' => 'r', 'Ś' => 's',
+		'ś' => 's', 'Ŝ' => 's', 'ŝ' => 's', 'Ş' => 's', 'ş' => 's', 'Š' => 's',
-        'ś' => 's', 'Ŝ' => 's', 'ŝ' => 's', 'Ş' => 's', 'ş' => 's', 'Š' => 's',
+		'š' => 's', 'Ţ' => 't', 'ţ' => 't', 'Ť' => 't', 'ť' => 't', 'Ŧ' => 't',
-        'š' => 's', 'Ţ' => 't', 'ţ' => 't', 'Ť' => 't', 'ť' => 't', 'Ŧ' => 't',
+		'ŧ' => 't', 'Ũ' => 'u', 'ũ' => 'u', 'Ū' => 'u', 'ū' => 'u', 'Ŭ' => 'u',
-        'ŧ' => 't', 'Ũ' => 'u', 'ũ' => 'u', 'Ū' => 'u', 'ū' => 'u', 'Ŭ' => 'u',
+		'ŭ' => 'u', 'Ů' => 'u', 'ů' => 'u', 'Ű' => 'u', 'ű' => 'u', 'Ų' => 'u',
-        'ŭ' => 'u', 'Ů' => 'u', 'ů' => 'u', 'Ű' => 'u', 'ű' => 'u', 'Ų' => 'u',
+		'ų' => 'u', 'Ŵ' => 'w', 'ŵ' => 'w', 'Ŷ' => 'y', 'ŷ' => 'y', 'Ÿ' => 'y',
-        'ų' => 'u', 'Ŵ' => 'w', 'ŵ' => 'w', 'Ŷ' => 'y', 'ŷ' => 'y', 'Ÿ' => 'y',
+		'Ź' => 'z', 'ź' => 'z', 'Ż' => 'z', 'ż' => 'z', 'Ž' => 'z', 'ž' => 'z',
-        'Ź' => 'z', 'ź' => 'z', 'Ż' => 'z', 'ż' => 'z', 'Ž' => 'z', 'ž' => 'z',
+		'ſ' => 'z', 'Ə' => 'e', 'ƒ' => 'f', 'Ơ' => 'o', 'ơ' => 'o', 'Ư' => 'u',
-        'ſ' => 'z', 'Ə' => 'e', 'ƒ' => 'f', 'Ơ' => 'o', 'ơ' => 'o', 'Ư' => 'u',
+		'ư' => 'u', 'Ǎ' => 'a', 'ǎ' => 'a', 'Ǐ' => 'i', 'ǐ' => 'i', 'Ǒ' => 'o',
-        'ư' => 'u', 'Ǎ' => 'a', 'ǎ' => 'a', 'Ǐ' => 'i', 'ǐ' => 'i', 'Ǒ' => 'o',
+		'ǒ' => 'o', 'Ǔ' => 'u', 'ǔ' => 'u', 'Ǖ' => 'u', 'ǖ' => 'u', 'Ǘ' => 'u',
-        'ǒ' => 'o', 'Ǔ' => 'u', 'ǔ' => 'u', 'Ǖ' => 'u', 'ǖ' => 'u', 'Ǘ' => 'u',
+		'ǘ' => 'u', 'Ǚ' => 'u', 'ǚ' => 'u', 'Ǜ' => 'u', 'ǜ' => 'u', 'Ǻ' => 'a',
-        'ǘ' => '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',
-        'И' => 'i', 'Й' => 'j', 'К' => 'k', 'Л' => 'l', 'М' => 'm', 'Н' => 'n',
+		'О' => 'o', 'П' => 'p', 'Р' => 'r', 'С' => 's', 'Т' => 't', 'У' => 'u',
-        'О' => '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',
-        'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e',
+		'ж' => 'zh','з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
-        'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
+		'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r', 'с' => 's',
-        'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r', 'с' => 's',
+		'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'h', 'ц' => 'c', 'ч' => 'ch',
-        'т' => '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',
-        'Ґ' => 'g', 'ґ' => 'g', 'א' => 'a', 'ב' => 'b', 'ג' => 'g', 'ד' => 'd',
+		'ה' => 'h', 'ו' => 'v', 'ז' => 'z', 'ח' => 'h', 'ט' => 't', 'י' => 'i',
-        'ה' => 'h', 'ו' => 'v', 'ז' => 'z', 'ח' => 'h', 'ט' => 't', 'י' => 'i',
+		'ך' => 'k', 'כ' => 'k', 'ל' => 'l', 'ם' => 'm', 'מ' => 'm', 'ן' => 'n',
-        'ך' => 'k', 'כ' => 'k', 'ל' => 'l', 'ם' => 'm', 'מ' => 'm', 'ן' => 'n',
+		'נ' => 'n', 'ס' => 's', 'ע' => 'e', 'ף' => 'p', 'פ' => 'p', 'ץ' => 'C',
-        'נ' => 'n', 'ס' => 's', 'ע' => 'e', 'ף' => 'p', 'פ' => 'p', 'ץ' => 'C',
+		'צ' => 'c', 'ק' => 'q', 'ר' => 'r', 'ש' => 'w', 'ת' => 't', '™' => 'tm',
-        'צ' => 'c', 'ק' => 'q', 'ר' => 'r', 'ש' => 'w', 'ת' => 't', '™' => 'tm',
+	);
-    );
+  $bad = array_merge(
-    $bad = array_merge(
+        array_map('chr', range(0,31)),
-        array_map('chr', range(0, 31)),
         array("<", ">", ":", '"', "/", "\\", "|", "?", "*"));
 
-    return str_replace($bad, "", strtr($dateiname, $_convertTable));
+	return str_replace($bad, "", strtr($dateiname, $_convertTable));
 }
 
-function setMinMemoryLimit($memDestSize): void
+function setMinMemoryLimit($memDestSize) {
-{
+	if (getBytes(ini_get('memory_limit')) < getBytes($memDestSize))
-    if (getBytes(ini_get('memory_limit')) < getBytes($memDestSize))
+		ini_set('memory_limit', $memDestSize);
-        ini_set('memory_limit', $memDestSize);
 }
 
-function getBytes($val): int|string
+function getBytes($val) {
-{
+	$val = trim($val);
-    $val = trim($val);
+	$last = strtolower($val{strlen($val)-1});
-    $numeric = substr($val, 0, strlen($val) - 1);
+	switch($last) {
-    $last = strtolower($val[strlen($val) - 1]);
+		// The 'G' modifier is available since PHP 5.1.0
-    switch ($last) {
+		case 'g':
-        // The 'G' modifier is available since PHP 5.1.0
+		  $val *= 1024;
-        case 'm':
+		case 'm':
-        case 'g':
+		  $val *= 1024;
-        case 'k':
+		case 'k':
-            $numeric *= 1024;
+		  $val *= 1024;
-            break;
+	}
-    }
+	return $val;
-    return $numeric;
 }
 
-function encrypt($str, $key): string
+function encrypt($str, $key){
-{
+  $result="";
-    $result = "";
+  for($i=0; $i<strlen($str); $i++) {
-    for ($i = 0; $i < strlen($str); $i++) {
+     $char = substr($str, $i, 1);
-        $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);
-    return base64_encode($result);
 }
 
-function decrypt($str, $key): string
+function decrypt($str, $key){
-{
+  $str = base64_decode($str);
-    $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);
-        $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;
-    return $result;
 }
 
-function individualwettbewerbFilter($prefix): string
+function individualwettbewerbFilter($prefix) {
-{
+	$db =& getDatabase();
-    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
+	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->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) ";
+	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 = ""): string
+function kategorieFilter($prefix, $suffix = "") {
-{
+	global $params;
-    global $params;
+	$kategorien = explode(",", $params->get( 'kategorien' ));
-    $kategorien = explode(",", $params->get('kategorien'));
+	$filter = "";
-    $filter = "";
+	foreach ($kategorien as $s) {
-    foreach ($kategorien as $s) {
+		$kategorie = intval(trim($s));
-        $kategorie = intval(trim($s));
+		if ($kategorie == 0)
-        if ($kategorie == 0)
+			continue;
-            continue;
+		if (!empty($filter))
-        if (!empty($filter))
+			$filter .= ", ";
-            $filter .= ", ";
+		$filter .= $kategorie;
-        $filter .= $kategorie;
+	}
-    }
+	return empty($filter) ? "" : (" " . $prefix . " (" . $filter . ") " . $suffix);
-    return empty($filter) ? "" : (" " . $prefix . " (" . $filter . ") " . $suffix);
 }
 
-function turnierFilter($prefix): string
+function turnierFilter($prefix) {
-{
+	$db =& getDatabase();
-    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
+	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->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()) >= -14) ";
 }
 
-function vereinFilter($prefix): string
+function vereinFilter($prefix) {
-{
+	$db =& getDatabase();
-    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
+	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->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) ";
+	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): string
+function veranstalterFilter($prefix) {
-{
+	$db =& getDatabase();
-    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
+	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->id;
-    return " " . $prefix . " (SELECT berechtigt_veranstalter_id FROM #__sportsmanager_berechtigt_fuer_veranstalter WHERE berechtigt_user_id = $user_id) ";
+	return " " . $prefix . " (SELECT berechtigt_veranstalter_id FROM #__sportsmanager_berechtigt_fuer_veranstalter WHERE berechtigt_user_id = $user_id) ";
 }
 
-function veranstaltungFilter($prefix): string
+function veranstaltungFilter($prefix) {
-{
+	$db =& getDatabase();
-    $user_id = isExternalDatabase() ? 0 : Factory::getContainer()->get(SiteApplication::class)->getIdentity()->id;
+	$user_id = isExternalDatabase() ? 0 : JFactory::getUser()->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()) >= -14) ";
 }
 
 // Berechnet Datum zum Montag der ersten Kalenderwoche eines Jahres
-function firstkw($jahr): bool|int
+function firstkw($jahr) {
-{
+  $erster = mktime(0,0,0,1,1,$jahr);
-    $erster = mktime(0, 0, 0, 1, 1, $jahr);
+  $wtag = date('w',$erster);
-    $wtag = date('w', $erster);
+	if ($wtag <= 4) {
-    if ($wtag <= 4) {
+       /**
-        /**
+        * Donnerstag oder kleiner: auf den Montag zurückrechnen.
-         * 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.
+        * 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;
+   return $montag;
 }
 
 // Berechnet Wochentag über Kalenderwoche, Jahr und Wochentag (0 = Montag, ...,  6 = Sonntag)
-function mondaykw($kw, $jahr, $weekday): bool|int
+function mondaykw($kw, $jahr, $weekday) {
-{
+  $firstmonday = firstkw($jahr);
-    $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): bool|int
+function geaenderterWochentag($datum, $wochentag) {
-{
+  $wtag = date('w', $datum);
-    $wtag = date('w', $datum);
+  if ($wtag == 0) // Sonntag
-    if ($wtag == 0) // Sonntag
+    $wtag = 7;
-        $wtag = 7;
+  $mon_monat = date('m', $datum);
-    $mon_monat = date('m', $datum);
+  $mon_jahr = date('Y', $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): ?string
+function normalisiertesDatum($datum) {
-{
+	if ($datum == NULL)
-    if ($datum == NULL)
+		return NULL;
-        return NULL;
 
-    if (str_contains($datum, "-"))
+	if (strpos($datum, "-") !== false)
-        $trennzeichen = "-";
+		$trennzeichen = "-";
-    else
+	else
-        $trennzeichen = ".";
+		$trennzeichen = ".";
 
-    $t = explode($trennzeichen, $datum);
+	$t = explode($trennzeichen, $datum);
-    $n = count($t);
+	$n = count($t);
-    if ($n == 1) {
+	if ($n == 1) {
-        $s = $t[0];
+		$s = $t[0];
-        if (strlen($s) < 8)
+		if (strlen($s) < 8)
-            return NULL;
+			return NULL;
-        $jahr = intval(substr($s, 0, 4));
+		$jahr = intval(substr($s, 0, 4));
-        $monat = intval(substr($s, 4, 2));
+		$monat = intval(substr($s, 4, 2));
-        $tag = intval(substr($s, 6, 2));
+		$tag = intval(substr($s, 6, 2));
-    } else if ($n == 3) {
+	}
-        if ($trennzeichen != ".") {
+	else if ($n == 3) {
-            $jahr = intval($t[0]);
+		if ($trennzeichen != ".") {
-            if (strlen($t[0]) <= 2)
+			$jahr = intval($t[0]);
-                $jahr += 1900;
+			if (strlen($t[0]) <= 2)
-            $monat = intval($t[1]);
+				$jahr += 1900;
-            $tag = intval($t[2]);
+			$monat = intval($t[1]);
-        } else {
+			$tag = intval($t[2]);
-            $tag = intval($t[0]);
+		}
-            $monat = intval($t[1]);
+		else {
-            $jahr = intval($t[2]);
+			$tag = intval($t[0]);
-            if (strlen($t[2]) <= 2)
+			$monat = intval($t[1]);
-                $jahr += 1900;
+			$jahr = intval($t[2]);
-        }
+			if (strlen($t[2]) <= 2)
-    } else
+				$jahr += 1900;
-        return NULL;
+		}
+	}
+	else
+		return NULL;
 
-    if (!checkdate($monat, $tag, $jahr))
+	if (!checkdate($monat, $tag, $jahr))
-        return NULL;
+		return NULL;
 
-    return sprintf("%04d-%02d-%02d", $jahr, $monat, $tag);
+	return sprintf("%04d-%02d-%02d", $jahr, $monat, $tag);;
 }
 
-function normalisierteUhrzeit($uhrzeit): ?string
+function normalisierteUhrzeit($uhrzeit) {
-{
+	if ($uhrzeit == NULL)
-    if ($uhrzeit == NULL)
+		return NULL;
-        return NULL;
 
-    if (str_contains($uhrzeit, "-"))
+	if (strpos($uhrzeit, "-") !== FALSE)
-        $trennzeichen = "-";
+		$trennzeichen = "-";
-    else
+	else
-        $trennzeichen = ":";
+		$trennzeichen = ":";
 
-    $t = explode($trennzeichen, $uhrzeit);
+	$t = explode($trennzeichen, $uhrzeit);
-    $n = count($t);
+	$n = count($t);
-    if ($n == 1) {
+	if ($n == 1) {
-        $s = $t[0];
+		$s = $t[0];
-        $len = strlen($s);
+		$len = strlen($s);
-        if ($len != 4 && $len != 6)
+		if ($len != 4 && $len != 6)
-            return NULL;
+			return NULL;
-        $stunden = intval(substr($s, 0, 2));
+		$stunden = intval(substr($s, 0, 2));
-        $minuten = intval(substr($s, 2, 2));
+		$minuten = intval(substr($s, 2, 2));
-        $sekunden = $len != 6 ? 0 : intval(substr($s, 4, 2));
+		$sekunden = $len != 6 ? 0 : intval(substr($s, 4, 2));
-    } else if ($n == 2 || $n == 3) {
+	}
-        $stunden = intval($t[0]);
+	else if ($n == 2 || $n == 3) {
-        $minuten = intval($t[1]);
+		$stunden = intval($t[0]);
-        $sekunden = $n != 3 ? 0 : intval($t[2]);
+		$minuten = intval($t[1]);
-    } else
+		$sekunden = $n != 3 ? 0 : intval($t[2]);
-        return NULL;
+	}
+	else
+		return NULL;
 
-    if ($stunden < 0 || $stunden > 23 || $minuten < 0 || $minuten > 59 || $sekunden < 0 || $sekunden > 59)
+	if ($stunden < 0 || $stunden > 23 || $minuten < 0 || $minuten > 59 || $sekunden < 0 || $sekunden > 59)
-        return NULL;
+		return NULL;
 
-    return sprintf("%02d:%02d:%02d", $stunden, $minuten, $sekunden);
+	return sprintf("%02d:%02d:%02d", $stunden, $minuten, $sekunden);;
 }
 
-function runden_detailliert_invers($runden): ?string
+function runden_detailliert_invers($runden) {
-{
+  if ($runden == null)
-    if ($runden == null)
+    return null;
-        return null;
+  $runden_invers = "";
-    $runden_invers = "";
+  $saetze = explode(" ", $runden);
+  foreach ($saetze as $satz) {
+    $punkte = explode(":", $satz);
+    if (!empty($runden_invers))
+      $runden_invers .= " ";
+    $runden_invers .= $punkte[1] . ":" . $punkte[0];
+  }
+  return $runden_invers;
+}
+
+function runden_detailliert_auswertung($runden) {
+  $ergebnis = 0;
+  $heim_saetze = 0;
+  $unentschieden_saetze = 0;
+  $gast_saetze = 0;
+  $heim_punkte = 0;
+  $gast_punkte = 0;
+  if ($runden != null) {
     $saetze = explode(" ", $runden);
     foreach ($saetze as $satz) {
-        $punkte = explode(":", $satz);
+      $punkte = explode(":", $satz);
-        if (!empty($runden_invers))
+      $heim_punkte += (int)$punkte[0];
-            $runden_invers .= " ";
+      $gast_punkte += (int)$punkte[1];
-        $runden_invers .= $punkte[1] . ":" . $punkte[0];
+      if ($punkte[0] > $punkte[1])
+        $heim_saetze++;
+      else if ($punkte[0] < $punkte[1])
+        $gast_saetze++;
+      else
+        $unentschieden_saetze++;
     }
-    return $runden_invers;
+    if ($heim_saetze > $gast_saetze)
-}
+      $ergebnis = 1;
-
+    else if ($heim_saetze < $gast_saetze)
-function runden_detailliert_auswertung($runden): array
+      $ergebnis = 2;
-{
+  }
-    $ergebnis = 0;
+  return array($ergebnis, $heim_saetze, $unentschieden_saetze, $gast_saetze, $heim_punkte, $gast_punkte);
-    $heim_saetze = 0;
-    $unentschieden_saetze = 0;
-    $gast_saetze = 0;
-    $heim_punkte = 0;
-    $gast_punkte = 0;
-    if ($runden != null) {
-        $saetze = explode(" ", $runden);
-        foreach ($saetze as $satz) {
-            $punkte = explode(":", $satz);
-            $heim_punkte += (int)$punkte[0];
-            $gast_punkte += (int)$punkte[1];
-            if ($punkte[0] > $punkte[1])
-                $heim_saetze++;
-            else if ($punkte[0] < $punkte[1])
-                $gast_saetze++;
-            else
-                $unentschieden_saetze++;
-        }
-        if ($heim_saetze > $gast_saetze)
-            $ergebnis = 1;
-        else if ($heim_saetze < $gast_saetze)
-            $ergebnis = 2;
-    }
-    return array($ergebnis, $heim_saetze, $unentschieden_saetze, $gast_saetze, $heim_punkte, $gast_punkte);
 }
 
 //   pass two file names
 //   returns TRUE if files are the same, FALSE otherwise
-function files_identical($fn1, $fn2): bool
+function files_identical($fn1, $fn2) {
-{
+	if(!is_file($fn1) || !is_file($fn2))
-    if (!is_file($fn1) || !is_file($fn2))
+		return FALSE;
-        return FALSE;
 
-    if (filesize($fn1) !== filesize($fn2))
+	if(filesize($fn1) !== filesize($fn2))
-        return FALSE;
+		return FALSE;
 
-    if (!$fp1 = fopen($fn1, 'rb'))
+	if(!$fp1 = fopen($fn1, 'rb'))
-        return FALSE;
+		return FALSE;
 
-    if (!$fp2 = fopen($fn2, 'rb')) {
+	if(!$fp2 = fopen($fn2, 'rb')) {
-        fclose($fp1);
+		fclose($fp1);
-        return FALSE;
+		return FALSE;
-    }
+	}
 
-    $same = TRUE;
+	$same = TRUE;
-    while (!feof($fp1) and !feof($fp2))
+	while (!feof($fp1) and !feof($fp2))
-        if (fread($fp1, 4096) !== fread($fp2, 4096)) {
+		if(fread($fp1, 4096) !== fread($fp2, 4096)) {
-            $same = FALSE;
+		$same = FALSE;
-            break;
+		break;
-        }
+	}
 
-    if (feof($fp1) !== feof($fp2))
+	if(feof($fp1) !== feof($fp2))
-        $same = FALSE;
+		$same = FALSE;
 
-    fclose($fp1);
+	fclose($fp1);
-    fclose($fp2);
+	fclose($fp2);
 
-    return $same;
+	return $same;
 }
-
+?>

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

@@ -1,477 +0,0 @@
-<?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;
-
-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";
-    $db->setQuery($query);
-    if (!$db->execute()) {
-        die($db->stderr(true));
-    }
-    $rows = $db->loadObjectList();
-    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, $resize = '', $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 = "/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 = ""): ?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/views/desktop.ini

@@ -0,0 +1,5 @@
+[.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

@@ -0,0 +1,5 @@
+[.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/desktop.ini

@@ -0,0 +1,5 @@
+[.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,218 +1,204 @@
 <?php
-
-use JetBrains\PhpStorm\NoReturn;
-
 defined('_JEXEC') or die('Restricted access');
 
-require_once JPATH_SITE . '/components/com_sportsmanager/views/sportsmanager/view_tools.php';
+require_once(JPATH_COMPONENT . DIRECTORY_SEPARATOR . '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): array
+	static function mannschaften($veranstaltung, $rows) {
-    {
+		$teams = [];
-        $teams = [];
+		foreach ($rows as $team) {
-        foreach ($rows as $team) {
+			$team->teambild = teamImage($team->team_id, $team->verein_id);
-            $team->teambild = teamImage($team->team_id, $team->verein_id);
+			$teams[]    = $team;
-            $teams[] = $team;
+		}
-        }
+		if ($veranstaltung == null) {
-        if ($veranstaltung == null) {
+			return $teams;
-            return $teams;
+		}
-        }
 
-        return [
+		return [
-            'veranstaltung' => $veranstaltung,
+			'veranstaltung' => $veranstaltung,
-            'teams' => $teams,
+			'teams'         => $teams,
+		];
+	}
+
+	static function tabelleAnzeigen($veranstaltung, $modus, $teams, $spieltag, $spieltage, $alleine_angezeigt, $praesentation) {
+		foreach ($teams as $team) {
+			$team->teambild = teamImage($team->team_id, $team->verein_id);
+		}
+
+		return [
+		    'tabelle' => $teams,
+            'modus' => $modus,
         ];
-    }
+	}
 
-    static function tabelleAnzeigen($modus, $teams): array
+	static function tabelleEigeneAnzeigen($veranstaltung, $modus, $teams, $alleine_angezeigt, $praesentation) {
-    {
+	    foreach($teams as $team) {
-        foreach ($teams as $team) {
+	        $team->teambild = teamImage($team->team_id, $team->verein_id);
-            $team->teambild = teamImage($team->team_id, $team->verein_id);
         }
-
+	    return [
-        return [
+	        'tabelle' => $teams,
-            'tabelle' => $teams,
             'modus' => $modus,
         ];
     }
 
-    static function tabelleEigeneAnzeigen($modus, $teams): array
+	static function _getPlayerDetails($game, $home_player_map, $away_player_map) {
-    {
+		// TODO dynamisch machen
-        foreach ($teams as $team) {
+		$game->heim_spieler_1_vorname = isset($home_player_map[$game->heim_spieler_1_id])
-            $team->teambild = teamImage($team->team_id, $team->verein_id);
+			? $home_player_map[$game->heim_spieler_1_id]->vorname
-        }
+			: NULL;
-        return [
+		$game->heim_spieler_1_nachname = isset($home_player_map[$game->heim_spieler_1_id])
-            'tabelle' => $teams,
+			? $home_player_map[$game->heim_spieler_1_id]->nachname
-            'modus' => $modus,
+			: NULL;
-        ];
+		$game->heim_spieler_1_bild = isset($home_player_map[$game->heim_spieler_1_id])
-    }
+			? $home_player_map[$game->heim_spieler_1_id]->bild
+			: NULL;
 
-    static function _getPlayerDetails($game, $home_player_map, $away_player_map): void
+		$game->heim_spieler_2_vorname = isset($home_player_map[$game->heim_spieler_2_id])
-    {
+			? $home_player_map[$game->heim_spieler_2_id]->vorname
-        // TODO dynamisch machen
+			: NULL;
-        $game->heim_spieler_1_vorname = isset($home_player_map[$game->heim_spieler_1_id])
+		$game->heim_spieler_2_nachname = isset($home_player_map[$game->heim_spieler_2_id])
-            ? $home_player_map[$game->heim_spieler_1_id]->vorname
+			? $home_player_map[$game->heim_spieler_2_id]->nachname
-            : NULL;
+			: NULL;
-        $game->heim_spieler_1_nachname = isset($home_player_map[$game->heim_spieler_1_id])
+		$game->heim_spieler_2_bild = isset($home_player_map[$game->heim_spieler_2_id])
-            ? $home_player_map[$game->heim_spieler_1_id]->nachname
+			? $home_player_map[$game->heim_spieler_2_id]->bild
-            : NULL;
+			: NULL;
-        $game->heim_spieler_1_bild = isset($home_player_map[$game->heim_spieler_1_id])
-            ? $home_player_map[$game->heim_spieler_1_id]->bild
-            : NULL;
 
-        $game->heim_spieler_2_vorname = isset($home_player_map[$game->heim_spieler_2_id])
+		$game->gast_spieler_1_vorname = isset($away_player_map[$game->gast_spieler_1_id])
-            ? $home_player_map[$game->heim_spieler_2_id]->vorname
+			? $away_player_map[$game->gast_spieler_1_id]->vorname
-            : NULL;
+			: NULL;
-        $game->heim_spieler_2_nachname = isset($home_player_map[$game->heim_spieler_2_id])
+		$game->gast_spieler_1_nachname = isset($away_player_map[$game->gast_spieler_1_id])
-            ? $home_player_map[$game->heim_spieler_2_id]->nachname
+			? $away_player_map[$game->gast_spieler_1_id]->nachname
-            : NULL;
+			: NULL;
-        $game->heim_spieler_2_bild = isset($home_player_map[$game->heim_spieler_2_id])
+		$game->gast_spieler_1_bild = isset($away_player_map[$game->gast_spieler_1_id])
-            ? $home_player_map[$game->heim_spieler_2_id]->bild
+			? $away_player_map[$game->gast_spieler_1_id]->bild
-            : NULL;
+			: NULL;
 
-        $game->gast_spieler_1_vorname = isset($away_player_map[$game->gast_spieler_1_id])
+		$game->gast_spieler_2_vorname = isset($away_player_map[$game->gast_spieler_2_id])
-            ? $away_player_map[$game->gast_spieler_1_id]->vorname
+			? $away_player_map[$game->gast_spieler_2_id]->vorname
-            : NULL;
+			: NULL;
-        $game->gast_spieler_1_nachname = isset($away_player_map[$game->gast_spieler_1_id])
+		$game->gast_spieler_2_nachname = isset($away_player_map[$game->gast_spieler_2_id])
-            ? $away_player_map[$game->gast_spieler_1_id]->nachname
+			? $away_player_map[$game->gast_spieler_2_id]->nachname
-            : NULL;
+			: NULL;
-        $game->gast_spieler_1_bild = isset($away_player_map[$game->gast_spieler_1_id])
+		$game->gast_spieler_2_bild = isset($away_player_map[$game->gast_spieler_2_id])
-            ? $away_player_map[$game->gast_spieler_1_id]->bild
+			? $away_player_map[$game->gast_spieler_2_id]->bild
-            : NULL;
+			: NULL;
 
-        $game->gast_spieler_2_vorname = isset($away_player_map[$game->gast_spieler_2_id])
+	}
-            ? $away_player_map[$game->gast_spieler_2_id]->vorname
-            : NULL;
-        $game->gast_spieler_2_nachname = isset($away_player_map[$game->gast_spieler_2_id])
-            ? $away_player_map[$game->gast_spieler_2_id]->nachname
-            : NULL;
-        $game->gast_spieler_2_bild = isset($away_player_map[$game->gast_spieler_2_id])
-            ? $away_player_map[$game->gast_spieler_2_id]->bild
-            : NULL;
 
-    }
+	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) {
-
+		$heim_team->teambild = teamImage($heim_team->team_id, $heim_team->verein_id);
-    static function adminEditBegegnungSpielplan($bestaetigen, $veranstaltung, $begegnung, $heim_team, $gast_team, $spiele, $heim_spieler, $gast_spieler, $teamspiel_modus): array
+		$gast_team->teambild = teamImage($gast_team->team_id, $gast_team->verein_id);
-    {
+		$heim_spieler_map = [];
-        $heim_team->teambild = teamImage($heim_team->team_id, $heim_team->verein_id);
+		$gast_spieler_map = [];
-        $gast_team->teambild = teamImage($gast_team->team_id, $gast_team->verein_id);
+		foreach ($heim_spieler as $player) {
-        $heim_spieler_map = [];
+			$player->bild = playerImage($player->spieler_id, $player->geschlecht);
-        $gast_spieler_map = [];
+			$heim_spieler_map[$player->spieler_id] = $player;
-        foreach ($heim_spieler as $player) {
+		}
-            $player->bild = playerImage($player->spieler_id, $player->geschlecht);
+		foreach ($gast_spieler as $player) {
-            $heim_spieler_map[$player->spieler_id] = $player;
+			$player->bild = playerImage($player->spieler_id, $player->geschlecht);
-        }
+			$gast_spieler_map[$player->spieler_id] = $player;
-        foreach ($gast_spieler as $player) {
+		}
-            $player->bild = playerImage($player->spieler_id, $player->geschlecht);
+		$begegnung->bezeichnung = $veranstaltung->bezeichnung;
-            $gast_spieler_map[$player->spieler_id] = $player;
+		$begegnung->veranstaltung_id = $veranstaltung->veranstaltung_id;
-        }
+		foreach ($spiele as $game) {
-        $begegnung->bezeichnung = $veranstaltung->bezeichnung;
+			self::_getPlayerDetails($game, $heim_spieler_map, $gast_spieler_map);
-        $begegnung->veranstaltung_id = $veranstaltung->veranstaltung_id;
+		}
-        foreach ($spiele as $game) {
-            self::_getPlayerDetails($game, $heim_spieler_map, $gast_spieler_map);
-        }
         $begegnung->spieltag = Rundenbezeichnung($begegnung->spieltag, $veranstaltung->unterteilung == 0);
-        return [
+		return [
-            'bestaetigen' => $bestaetigen,
+			'bestaetigen' => $bestaetigen,
-            'veranstaltung' => $veranstaltung,
+			'veranstaltung' => $veranstaltung,
-            'begegnung' => $begegnung,
+			'begegnung' => $begegnung,
-            'heim_team' => $heim_team,
+			'heim_team' => $heim_team,
-            'gast_team' => $gast_team,
+			'gast_team' => $gast_team,
-            'spiele' => $spiele,
+			'spiele' => $spiele,
-            'heim_spieler' => $heim_spieler,
+			'heim_spieler' => $heim_spieler,
-            'gast_spieler' => $gast_spieler,
+			'gast_spieler' => $gast_spieler,
-            'modus' => $teamspiel_modus,
+			'modus' => $teamspiel_modus,
-        ];
+		];
-    }
+	}
 
-    static function mannschaftDetails($veranstaltung, $team, $mitglieder, $teamansprechpartner, $begegnungen, $ansprechpartner_anzeigen, $veranstaltungsbezeichnungen): array
+	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) {
-    {
+		global $sportsmanager_joomla_path;
-        global $sportsmanager_joomla_path;
+		global $sportsmanager_joomla_url;
-        global $sportsmanager_joomla_url;
+		
-
+		$team->teambild = teamImage($team->team_id, $team->verein_id);
-        $team->teambild = teamImage($team->team_id, $team->verein_id);
+		$team->color = getColorOfImage(str_replace($sportsmanager_joomla_url, $sportsmanager_joomla_path . '/', $team->teambild));
-        $team->color = getColorOfImage(str_replace($sportsmanager_joomla_url, $sportsmanager_joomla_path . '/', $team->teambild));
+		foreach ($mitglieder as $m) {
-        foreach ($mitglieder as $m) {
+			$m->bild = playerImage($m->spieler_id, $m->geschlecht);
-            $m->bild = playerImage($m->spieler_id, $m->geschlecht);
+		}
-        }
+		foreach ($begegnungen as $begegnung) {
-        foreach ($begegnungen as $begegnung) {
+		    $begegnung->heim_name = $begegnung->auswaerts == '1' ? $begegnung->gegner : $team->teamname;
-            $begegnung->heim_name = $begegnung->auswaerts == '1' ? $begegnung->gegner : $team->teamname;
             $begegnung->heim_teamgruppe = $begegnung->auswaerts == '1' ? $begegnung->gegner_teamgruppe_id : $team->teamgruppe_id;
-            $begegnung->gast_name = $begegnung->auswaerts == '1' ? $team->teamname : $begegnung->gegner;
+		    $begegnung->gast_name = $begegnung->auswaerts == '1' ? $team->teamname : $begegnung->gegner;
             $begegnung->gast_teamgruppe = $begegnung->auswaerts == '1' ? $team->teamgruppe_id : $begegnung->gegner_teamgruppe_id;
-            $begegnung->spielort_name = $begegnung->heimspielort_name;
+		    $begegnung->spielort_name = $begegnung->heimspielort_name;
-            $begegnung->heim_bild = $begegnung->auswaerts == '1' ? teamImage($begegnung->gegner_id, $begegnung->gegner_verein_id) : teamImage($team->team_id, $team->verein_id);
+		    $begegnung->heim_bild = $begegnung->auswaerts == '1' ? teamImage($begegnung->gegner_id, $begegnung->gegner_verein_id) : teamImage($team->team_id, $team->verein_id);
-            $begegnung->gast_bild = $begegnung->auswaerts == '1' ? teamImage($team->team_id, $team->verein_id) : teamImage($begegnung->gegner_id, $begegnung->gegner_verein_id);
+		    $begegnung->gast_bild = $begegnung->auswaerts == '1' ? teamImage($team->team_id, $team->verein_id) : teamImage($begegnung->gegner_id, $begegnung->gegner_verein_id);
-            $begegnung->bezeichnung = $veranstaltungsbezeichnungen[$begegnung->veranstaltung_id];
+		    $begegnung->bezeichnung = $veranstaltungsbezeichnungen[$begegnung->veranstaltung_id];
             $begegnung->spieltag = Rundenbezeichnung($begegnung->spieltag, $veranstaltung->unterteilung == 0);
         }
 
         if (getUserID() == 0 && $ansprechpartner_anzeigen) {
-            foreach ($teamansprechpartner as $ansprechpartner) {
+		    foreach ($teamansprechpartner as $ansprechpartner) {
-                unset($ansprechpartner->mobil);
+		        unset($ansprechpartner->mobil);
-                unset($ansprechpartner->telefon);
+		        unset($ansprechpartner->telefon);
             }
         }
 
         $team->veranstaltung_name = $veranstaltungsbezeichnungen[$team->veranstaltung_id];
-        return [
+		return [
-            'team' => $team,
+			'team' => $team,
-            'mitglieder' => $mitglieder,
+			'mitglieder' => $mitglieder,
-            'kontakt' => $ansprechpartner_anzeigen ? $teamansprechpartner : NULL,
+			'kontakt' => $ansprechpartner_anzeigen ? $teamansprechpartner : NULL,
-            'begegnungen' => $begegnungen
+			'begegnungen' => $begegnungen
-        ];
+		];
-    }
+	}
 
-    #[NoReturn] static function JSON($data, $meta = NULL): void
+	static function JSON($data, $meta = NULL) {
-    {
+		$response = [
-        $response = [
+			'data' => $data
-            'data' => $data
+		];
-        ];
+		if ($meta != NULL) {
-        if ($meta != NULL) {
+			$response['meta'] = $meta;
-            $response['meta'] = $meta;
+		}
-        }
+		header('Content-Type: application/json; charset=utf-8', true);
-        header('Content-Type: application/json; charset=utf-8');
+		echo json_encode($response);
-        echo json_encode($response);
+		jexit();
-        jexit();
+	}
-    }
 
-    #[NoReturn] static function spielerstatistik($spielerstatistik_punkte): void
+	static function spielerstatistik($spielerstatistik, $spielerstatistik_punkte, $allein_angezeigt, $filter_saison_id, $vorherige_spielerstatistik_id, $naechste_spielerstatistik_id, $details_anzeigen) {
-    {
+		$rank = 1;
-        $rank = 1;
+		foreach ($spielerstatistik_punkte as $s) {
-        foreach ($spielerstatistik_punkte as $s) {
+			$s->spieler_bild = playerImage($s->spieler_id, $s->geschlecht);
-            $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)
-            $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;
-            $s->rank = '' . $rank;
+			$rank++;
-            $rank++;
+		}
-        }
+		self::JSON($spielerstatistik_punkte);
-        self::JSON($spielerstatistik_punkte);
+	}
-    }
 
-    #[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
+	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) {
-    {
+	    $letzte_einzel = [];
-        $letzte_einzel = [];
+	    $spieler->bild = playerImage($spieler->spieler_id, $spieler->geschlecht);
-        $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];
-            $e = $spieler_elo_verlauf_einzel[$i];
+	        $letzte_einzel[] = [
-            $letzte_einzel[] = [
+	            'datum' => $e['z'],
-                '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'),
@@ -235,10 +221,10 @@ class JSON_sportsmanager
             ];
         }
         $letzte_doppel = [];
-        for ($i = sizeof($spieler_elo_verlauf_doppel) - 1; $i >= max(sizeof($spieler_elo_verlauf_doppel) - 10, 0); $i--) {
+	    for ($i = sizeof($spieler_elo_verlauf_doppel) - 1; $i >= max(sizeof($spieler_elo_verlauf_doppel) - 10, 0); $i--) {
-            $d = $spieler_elo_verlauf_doppel[$i];
+	        $d = $spieler_elo_verlauf_doppel[$i];
-            $letzte_doppel[] = [
+	        $letzte_doppel[] = [
-                'datum' => $d['z'],
+	            'datum' => $d['z'],
                 'spieler_1' => isset($spielerNamen[$d['h1']]) ? [
                     'spieler_id' => $d['h1'],
                     'bild' => playerImage($d['h1'], 'M'),
@@ -266,7 +252,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'],
@@ -282,11 +268,11 @@ class JSON_sportsmanager
                 'ergebnis' => $d['s'],
             ];
         }
-        self::JSON([
+	    self::JSON([
-            'spieler' => $spieler,
+	        'spieler' => $spieler,
             'vereine' => $vereine,
             'teams' => $teams,
-            'veranstalter' => $veranstalter,
+            'veranstalter'=> $veranstalter,
             'ranglisten_platzierungen' => $ranglistenplatzierungen,
             'turnier_platzierungen' => $turnierplatzierungen,
             'statistik' => $statistik,
@@ -299,54 +285,53 @@ class JSON_sportsmanager
         ]);
     }
 
-    #[NoReturn] static function begegnungVerlegen($veranstaltung, $verlegen_aktionen, $berechtigt_fuer_akzeptieren, $vorschlagendes_team_id): void
+	static function begegnungVerlegen($veranstaltung, $begegnung, $heim_team, $gast_team, $verlegen_aktionen, $berechtigt_fuer_akzeptieren, $aus_uebersicht, $vorschlagendes_team_id) {
-    {
+		$letzte_aktionen = array();
-        $letzte_aktionen = array();
+		foreach ($verlegen_aktionen as $aktion) {
-        foreach ($verlegen_aktionen as $aktion) {
+			if ($aktion->aktion == 1 || $aktion->aktion == 5 || $aktion == 10) {
-            if ($aktion->aktion == 1 || $aktion->aktion == 5 || $aktion == 10) {
+				break;
-                break;
+			}
-            }
+			array_push($letzte_aktionen, $aktion);
-            $letzte_aktionen[] = $aktion;
+		}
-        }
+		$termine = array();
-        $termine = array();
+		if (count($letzte_aktionen) > 0) {
-        if (count($letzte_aktionen) > 0) {
+			$eingetragen = $letzte_aktionen[0]->eingetragen;
-            $eingetragen = $letzte_aktionen[0]->eingetragen;
+			foreach ($letzte_aktionen as $aktion) {
-            foreach ($letzte_aktionen as $aktion) {
+				if ($aktion->eingetragen != $eingetragen || $aktion->aktion != 0 || $aktion->zeitpunkt == NULL) {
-                if ($aktion->eingetragen != $eingetragen || $aktion->aktion != 0 || $aktion->zeitpunkt == NULL) {
+					break;
-                    break;
+				}
-                }
+				array_push($termine, $aktion);
-                $termine[] = $aktion;
+			}
-            }
+		}
-        }
 
-        $berechtigt_anfordern = $veranstaltung->initial_ohne_termin != 1 && (count($letzte_aktionen) == 0 || $letzte_aktionen[0]->aktion == 1);
+		$berechtigt_anfordern = $veranstaltung->initial_ohne_termin != 1 && (count($letzte_aktionen) == 0 || $letzte_aktionen[0]->aktion == 1);
-        $berechtigt_vorschlagen = ($veranstaltung->initial_ohne_termin != 2 || (count($letzte_aktionen) != 0 && $letzte_aktionen[0]->aktion != 1))
+		$berechtigt_vorschlagen = ($veranstaltung->initial_ohne_termin != 2 || (count($letzte_aktionen) != 0 && $letzte_aktionen[0]->aktion != 1))
-            && (!$veranstaltung->keine_gegenvorschlaege || count($letzte_aktionen) == 0 || $letzte_aktionen[0]->aktion != 3 || $letzte_aktionen[0]->team_id != $vorschlagendes_team_id)
+			&& (!$veranstaltung->keine_gegenvorschlaege || count($letzte_aktionen) == 0 || $letzte_aktionen[0]->aktion != 3 || $letzte_aktionen[0]->team_id != $vorschlagendes_team_id)
-            && (count($termine) == 0 || !$veranstaltung->keine_gegenvorschlaege || $letzte_aktionen[0]->team_id == $vorschlagendes_team_id);
+			&& (count($termine) == 0 || !$veranstaltung->keine_gegenvorschlaege || $letzte_aktionen[0]->team_id == $vorschlagendes_team_id);
-        $berechtigt_ablehnen = count($letzte_aktionen) != 0 && ($letzte_aktionen[0]->aktion == 0 || $letzte_aktionen[0]->aktion == 3 || $letzte_aktionen[0]->aktion == 4)
+		$berechtigt_ablehnen = count($letzte_aktionen) != 0 && ($letzte_aktionen[0]->aktion == 0 || $letzte_aktionen[0]->aktion == 3 || $letzte_aktionen[0]->aktion == 4)
-            && ((($veranstaltung->ablehnen == 1 || $veranstaltung->ablehnen == 3) && $berechtigt_fuer_akzeptieren) || (($veranstaltung->ablehnen == 1 || $veranstaltung->ablehnen == 2)
+			&& ((($veranstaltung->ablehnen == 1 || $veranstaltung->ablehnen == 3) && $berechtigt_fuer_akzeptieren) || (($veranstaltung->ablehnen == 1 || $veranstaltung->ablehnen == 2)
-                    && $berechtigt_vorschlagen));
+			&& $berechtigt_vorschlagen));
 
-        $response = [];
+		$response = [];
-        $anzahl_termine = $veranstaltung->termine_maximal == 0 ? 3 : $veranstaltung->termine_maximal;
+		$anzahl_termine = $veranstaltung->termine_maximal == 0 ? 3 : $veranstaltung->termine_maximal;
 
-        for ($termin = 1; $termin <= $anzahl_termine; $termin++) {
+		for ($termin = 1; $termin <= $anzahl_termine; $termin++) {
-            if (isset($termine[$termin - 1])) {
+			if (isset($termine[$termin-1])) {
-                $response[] = [
+				$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
-                ];
+				];
-            }
+			}
-        }
+		}
 
-        self::JSON([
+		self::JSON([
-            'termine' => $response,
+			'termine' => $response,
-            'berechtigt_anfordern' => $berechtigt_anfordern,
+			'berechtigt_anfordern' => $berechtigt_anfordern,
-            'berechtigt_ablehnen' => $berechtigt_ablehnen,
+			'berechtigt_ablehnen' => $berechtigt_ablehnen,
-            'berechtigt_akzeptieren' => (bool)$berechtigt_fuer_akzeptieren,
+			'berechtigt_akzeptieren' => $berechtigt_fuer_akzeptieren ? TRUE : FALSE,
-            'termine_minimal' => $veranstaltung->termine_minimal,
+			'termine_minimal' => $veranstaltung->termine_minimal,
-            'termine_maximal' => $veranstaltung->termine_maximal,
+			'termine_maximal' => $veranstaltung->termine_maximal,
-        ]);
+		]);
 
-    }
+	}
 }

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

@@ -3,32 +3,29 @@
  * Sports Manager (C) 2006-2020, Sven Nickel
  */
 
-use Joomla\Filesystem\Folder;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Uri\Uri;
-
 // kein direkter Zugriff
-defined("_JEXEC") or die("Restricted access");
+defined('_JEXEC') or die('Restricted access');
 
-function htmlentities_utf8($s): string
+function htmlentities_utf8($s) {
-{
 	return htmlentities($s, ENT_QUOTES, "UTF-8");
 }
 
-function addOnLoad($function): void
+function htmlentities_noquotes_utf8($s) {
-{
+	return htmlentities($s, ENT_NOQUOTES, "UTF-8");
+}
+
+function addOnLoad($function) {
 	?>
     <script language="JavaScript">
       function addLoadEvent(func) {
-          const oldOnload = window.onload;
+        var oldonload = window.onload;
-          if (typeof window.onload != 'function') {
+        if (typeof window.onload != 'function') {
           window.onload = func;
         }
         else {
           window.onload = function () {
-            if (oldOnload) {
+            if (oldonload) {
-              oldOnload();
+              oldonload();
             }
             func();
           }
@@ -40,87 +37,57 @@ function addOnLoad($function): void
 	<?php
 }
 
-function SportsManagerURL($weitereParameter = null, $ssl = 0): ?string
+function SportsManagerURL($weitereParameter = null, $ssl = 0) {
-{
+	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 handleFilter($urlPart)
+function NichtLeererString($s, $ersatz = "Keiner") {
-{
-    // 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(): array
+function Laenderkennungen() {
-{
+	$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): string
+function rundenstufe($stufe) {
-{
+	switch ($stufe) {
-	return match ($stufe) {
+		case 0:
-        0 => Text::_("COM_SPORTSMANAGER_FINAL_RANKS"),
+			$bezeichnung = JText::_('COM_SPORTSMANAGER_FINAL_RANKS');
-        1 => Text::_("COM_SPORTSMANAGER_MAIN_ROUND"),
+			break;
-        2 => Text::_("COM_SPORTSMANAGER_ADDITIONAL_ROUND"),
+		case 1:
-        3 => Text::_("COM_SPORTSMANAGER_2ND_ADDITIONAL_ROUND"),
+			$bezeichnung = JText::_('COM_SPORTSMANAGER_MAIN_ROUND');
-        10 => Text::_("COM_SPORTSMANAGER_PRELIMINARY_ROUND"),
+			break;
-        20 => Text::_("COM_SPORTSMANAGER_REGISTRATIONS"),
+		case 2:
-        default => "",
+			$bezeichnung = JText::_('COM_SPORTSMANAGER_ADDITIONAL_ROUND');
-    };
+			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 = Text::_("COM_SPORTSMANAGER_NONE");
+		$ersatz = JText::_('COM_SPORTSMANAGER_NONE');
-	}
 	$t1 = NichtLeererString($titel1, $ersatz);
 	$t2 = NichtLeererString($titel2, $ersatz);
 
@@ -130,59 +97,65 @@ function StringsZusammenfassen($titel1, $titel2, $ersatz = null, $separator = "
 function Rundenbezeichnung($runde, $spieltag = false, $bezeichnung_verstecken = false, $kurzform = false) {
 	if ($kurzform) {
 		if ($runde >= 20000)
-			return Text::sprintf("COM_SPORTSMANAGER_PLACE_FROM_TO_SHORTCUT", 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
+			return JText::sprintf('COM_SPORTSMANAGER_PLACE_FROM_TO_SHORTCUT', 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
 
-        return match ($runde) {
+		switch ($runde) {
-            0 => $spieltag
+			case 0:
-                ? Text::_("COM_SPORTSMANAGER_MATCH_DAY_NONE")
+				return $spieltag ? JText::_('COM_SPORTSMANAGER_MATCH_DAY_NONE') : JText::_('COM_SPORTSMANAGER_ROUND_NONE');
-                : Text::_("COM_SPORTSMANAGER_ROUND_NONE"),
+			case 19999:
-            19999 => Text::_("COM_SPORTSMANAGER_FINAL_SHORTCUT"),
+				return JText::_('COM_SPORTSMANAGER_FINAL_SHORTCUT');
-            19998 => Text::_("COM_SPORTSMANAGER_3RD_PLACE_SHORTCUT"),
+			case 19998:
-            19997 => Text::_("COM_SPORTSMANAGER_HALF_FINAL_SHORTCUT"),
+				return JText::_('COM_SPORTSMANAGER_3RD_PLACE_SHORTCUT');
-            19996 => Text::_("COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT"),
+			case 19997:
-            19995 => Text::_("COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT"),
+				return JText::_('COM_SPORTSMANAGER_HALF_FINAL_SHORTCUT');
-            19994 => Text::_("COM_SPORTSMANAGER_ROUND_OF_32_SHORTCUT"),
+			case 19996:
-            19993 => Text::_("COM_SPORTSMANAGER_ROUND_OF_64_SHORTCUT"),
+				return JText::_('COM_SPORTSMANAGER_QUARTER_FINAL_SHORTCUT');
-            19992 => Text::_("COM_SPORTSMANAGER_ROUND_OF_128_SHORTCUT"),
+			case 19995:
-            default => $bezeichnung_verstecken ? $runde : Text::sprintf($spieltag ? "COM_SPORTSMANAGER_MATCH_DAY_NR_SHORTCUT" : "COM_SPORTSMANAGER_ROUND_NR_SHORTCUT", $runde),
+				return JText::_('COM_SPORTSMANAGER_ROUND_OF_16_SHORTCUT');
-        };
+			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 Text::sprintf("COM_SPORTSMANAGER_PLACE_FROM_TO", 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
+			return JText::sprintf('COM_SPORTSMANAGER_PLACE_FROM_TO', 99 - $runde % 100, 99 - floor(($runde - 20000) / 100) + 99 - ($runde % 100));
 
-        return match ($runde) {
+		switch ($runde) {
-            0 => $spieltag
+			case 0:
-                ? Text::_("COM_SPORTSMANAGER_MATCH_DAY_NONE")
+				return $spieltag ? JText::_('COM_SPORTSMANAGER_MATCH_DAY_NONE') : JText::_('COM_SPORTSMANAGER_ROUND_NONE');
-                : Text::_("COM_SPORTSMANAGER_ROUND_NONE"),
+			case 19999:
-            19999 => Text::_("COM_SPORTSMANAGER_FINAL"),
+				return JText::_('COM_SPORTSMANAGER_FINAL');
-            19998 => Text::_("COM_SPORTSMANAGER_3RD_PLACE"),
+			case 19998:
-            19997 => Text::_("COM_SPORTSMANAGER_HALF_FINAL"),
+				return JText::_('COM_SPORTSMANAGER_3RD_PLACE');
-            19996 => Text::_("COM_SPORTSMANAGER_QUARTER_FINAL"),
+			case 19997:
-            19995 => Text::_("COM_SPORTSMANAGER_ROUND_OF_16"),
+				return JText::_('COM_SPORTSMANAGER_HALF_FINAL');
-            19994 => Text::_("COM_SPORTSMANAGER_ROUND_OF_32"),
+			case 19996:
-            19993 => Text::_("COM_SPORTSMANAGER_ROUND_OF_64"),
+				return JText::_('COM_SPORTSMANAGER_QUARTER_FINAL');
-            19992 => Text::_("COM_SPORTSMANAGER_ROUND_OF_128"),
+			case 19995:
-            default => $bezeichnung_verstecken
+				return JText::_('COM_SPORTSMANAGER_ROUND_OF_16');
-                ? $runde
+			case 19994:
-                : Text::sprintf(
+				return JText::_('COM_SPORTSMANAGER_ROUND_OF_32');
-                    $spieltag
+			case 19993:
-                        ? "COM_SPORTSMANAGER_MATCH_DAY_NR"
+				return JText::_('COM_SPORTSMANAGER_ROUND_OF_64');
-                        : "COM_SPORTSMANAGER_ROUND_NR",
+			case 19992:
-                    $runde
+				return JText::_('COM_SPORTSMANAGER_ROUND_OF_128');
-                ),
+		}
-        };
 
-    }
+		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): string
+function FormatiertesDatum($s, $zeit_anzeigen = true, $wochentag_anzeigen = true) {
-{
 	if ($s != null && strlen($s) > 0) {
 		$ts = getdate(strtotime($s));
 		if ($wochentag_anzeigen) {
-			$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"));
+			$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'));
 			if ($zeit_anzeigen)
 				return sprintf("%s, %02d.%02d.%04d %02d:%02d", $wochentage[$ts["wday"]], $ts["mday"], $ts["mon"], $ts["year"], $ts["hours"], $ts["minutes"]);
 
@@ -194,11 +167,10 @@ function FormatiertesDatum($s, $zeit_anzeigen = true, $wochentag_anzeigen = true
 		return sprintf("%02d.%02d.%04d", $ts["mday"], $ts["mon"], $ts["year"]);
 	}
 
-	return Text::_("COM_SPORTSMANAGER_DATE_NONE");
+	return JText::_('COM_SPORTSMANAGER_DATE_NONE');
 }
 
-function FormatierterTermin($erster_tag, $letzter_tag, $jahr_anzeigen = false, $filter_jahr = null): string
+function FormatierterTermin($erster_tag, $letzter_tag, $jahr_anzeigen = false, $filter_jahr = null) {
-{
 	$erster_ts  = getdate(strtotime($erster_tag));
 	$letzter_ts = getdate(strtotime($letzter_tag));
 	if (!empty($filter_jahr))
@@ -216,12 +188,401 @@ function FormatierterTermin($erster_tag, $letzter_tag, $jahr_anzeigen = false, $
 	return $erster_termin . "-" . $letzter_termin;
 }
 
-function terminDokumentname($id): bool|string
+function bildLoeschen($typ, $id) {
+	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 = Folder::files($pfad, '^' . $id . ' ');
+	$dokumente = JFolder::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 (Test)
+; Sports Manager (C) 2006-2020, Sven Nickel
 COM_SPORTSMANAGER="Sports Manager"
 COM_SPORTSMANAGER_PLAYERS="Spieler"
 COM_SPORTSMANAGER_CLUBS="Vereine"
@@ -70,18 +70,17 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Willst du die Rangliste wirklich entfe
 COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Individualwettbewerb hinzufügen"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individualwettbewerb"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individualwettbewerbe"
-COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"
 COM_SPORTSMANAGER_GAME="Spiel"
 COM_SPORTSMANAGER_GAMES="Spiele"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="S"
 COM_SPORTSMANAGER_ADD_PLAYER_STATISTICS="Spielerstatistik hinzufügen"
-COM_SPORTSMANAGER_PLAYER_STATISTIC="Spielerstatistik"
+COM_SPORTSMANAGER_PLAYER_STATISTICS="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_PLAYER_STATISTICS="Willst du die Spielerstatistik wirklich entfernen?"
+COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Willst du die Spielerstatistik wirklich entfernen?"
 COM_SPORTSMANAGER_LIVE_TICKER="Live-Ticker"
 COM_SPORTSMANAGER_PLACE="Platz"
 COM_SPORTSMANAGER_TEAM="Mannschaft"
@@ -290,6 +289,7 @@ 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"
@@ -366,7 +366,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"
@@ -649,10 +649,6 @@ COM_SPORTSMANAGER_IMAGE_WITHIN_TEAM="Bild innerhalb Mannschaft"
 COM_SPORTSMANAGER_ADD_MEETING="Begegnung hinzufügen"
 COM_SPORTSMANAGER_ROUND_GENERATION="Runde erzeugen"
 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"
@@ -698,7 +694,6 @@ 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ätze maximal"
@@ -832,6 +827,7 @@ 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"
@@ -929,67 +925,3 @@ 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"

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"
@@ -70,18 +70,17 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Do you really want to remove the ranki
 COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Add individual competition"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individual competition"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individual competitions"
-COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"
 COM_SPORTSMANAGER_GAME="Game"
 COM_SPORTSMANAGER_GAMES="Games"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="G"
 COM_SPORTSMANAGER_ADD_PLAYER_STATISTICS="Add player statistics"
-COM_SPORTSMANAGER_PLAYER_STATISTIC="Player statistics"
+COM_SPORTSMANAGER_PLAYER_STATISTICS="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_PLAYER_STATISTICS="Do you really want to remove the player statistics?"
+COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Do you really want to remove the player statistics?"
 COM_SPORTSMANAGER_LIVE_TICKER="Live ticker"
 COM_SPORTSMANAGER_PLACE="Place"
 COM_SPORTSMANAGER_TEAM="Team"
@@ -290,6 +289,7 @@ 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"
@@ -362,7 +362,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?"
@@ -444,7 +444,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="District"
+COM_SPORTSMANAGER_DISTRICT="Ristrict"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_TEAM="Eligible for team"
 COM_SPORTSMANAGER_ELIGIBLE_FOR_CLUB="Eligible for club"
 COM_SPORTSMANAGER_SAVED_CLUB="Club to maintain"
@@ -649,10 +649,6 @@ COM_SPORTSMANAGER_IMAGE_WITHIN_TEAM="Image within team"
 COM_SPORTSMANAGER_ADD_MEETING="Add match"
 COM_SPORTSMANAGER_ROUND_GENERATION="Generate 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"
@@ -698,7 +694,6 @@ 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"
@@ -832,6 +827,7 @@ 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"
@@ -925,69 +921,3 @@ 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_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"