Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
88a24e4968 | ||
|
|
428f9e627e | ||
|
|
5c99ce6f22 | ||
|
|
83177f31f8 | ||
|
|
5be6194ee3 | ||
|
|
9953cac299 | ||
|
|
0b43d35567 | ||
|
|
c175e5f230 | ||
|
|
5e62482c56 | ||
|
|
b5da977ae1 | ||
|
|
802c777744 | ||
|
|
5f7e304f28 | ||
|
|
86b9bbdb78 | ||
|
|
5fd1387d36 | ||
|
|
43462960d5 | ||
|
|
9db8e0fbb6 | ||
|
|
4dce1658e2 | ||
|
|
112f76d8a3 | ||
|
|
3c8a46aaae | ||
|
|
dbd3cf4aa7 | ||
|
|
48784a59af | ||
|
|
994bfd9b5b | ||
|
|
18c94e1bf8 | ||
|
|
923d8b6049 | ||
|
|
b0d90f7076 | ||
|
|
0f08af60e8 | ||
|
|
4e32a82e84 |
No files matched your search
@@ -3,26 +3,34 @@ name: Deploy Development
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [develop]
|
branches: [develop]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Deploy Karatewiki to development (Raspberry Pi 5)
|
- name: Deploy Karatewiki to development (Raspberry Pi 5)
|
||||||
|
env:
|
||||||
|
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
echo "=== Deploying Karatewiki to DEVELOPMENT ==="
|
echo "=== Deploying Karatewiki to DEVELOPMENT ==="
|
||||||
REPO="http://192.168.2.144:3000/Lars/karatewiki.git"
|
REPO="http://192.168.2.144:3000/Lars/karatewiki.git"
|
||||||
TARGET="/home/lars/docker/karatewiki-dev"
|
TARGET="/home/lars/docker/karatewiki-dev"
|
||||||
mkdir -p "$TARGET/backups/db-init"
|
mkdir -p "$TARGET"
|
||||||
cd "$TARGET"
|
cd "$TARGET"
|
||||||
if [ ! -d .git ]; then
|
if [ ! -d .git ]; then
|
||||||
git clone -b develop "$REPO" .
|
git init
|
||||||
else
|
|
||||||
git fetch origin develop
|
|
||||||
git checkout develop
|
|
||||||
git reset --hard origin/develop
|
|
||||||
fi
|
fi
|
||||||
|
if git remote get-url origin >/dev/null 2>&1; then
|
||||||
|
git remote set-url origin "$REPO"
|
||||||
|
else
|
||||||
|
git remote add origin "$REPO"
|
||||||
|
fi
|
||||||
|
git fetch origin develop
|
||||||
|
git checkout -B develop origin/develop
|
||||||
|
git reset --hard origin/develop
|
||||||
|
mkdir -p "$TARGET/backups/db-init"
|
||||||
if [ ! -f .env ]; then
|
if [ ! -f .env ]; then
|
||||||
umask 077
|
umask 077
|
||||||
SECRET="$(od -An -N32 -tx1 /dev/urandom | tr -d ' \n')"
|
SECRET="$(od -An -N32 -tx1 /dev/urandom | tr -d ' \n')"
|
||||||
@@ -31,7 +39,7 @@ jobs:
|
|||||||
'MW_ENV=development' \
|
'MW_ENV=development' \
|
||||||
'MW_PORT=3093' \
|
'MW_PORT=3093' \
|
||||||
'MW_SERVER=http://192.168.2.49:3093' \
|
'MW_SERVER=http://192.168.2.49:3093' \
|
||||||
'MW_SITENAME=Karate (DEV)' \
|
'MW_SITENAME=Karate-DEV' \
|
||||||
'MW_DB_NAME=karatewiki_dev' \
|
'MW_DB_NAME=karatewiki_dev' \
|
||||||
'MW_DB_USER=karatewiki_dev' \
|
'MW_DB_USER=karatewiki_dev' \
|
||||||
'MW_DB_PASSWORD=dev_password_change_me' \
|
'MW_DB_PASSWORD=dev_password_change_me' \
|
||||||
@@ -43,23 +51,100 @@ jobs:
|
|||||||
echo "created $TARGET/.env from dev defaults"
|
echo "created $TARGET/.env from dev defaults"
|
||||||
umask 022
|
umask 022
|
||||||
fi
|
fi
|
||||||
docker compose -f docker-compose.dev-env.yml build --no-cache mediawiki
|
|
||||||
|
# Klammern in bestehender .env bereinigen und DB-Variablen sicher ohne "source" auslesen
|
||||||
|
sed -i 's/MW_SITENAME=Karate (DEV)/MW_SITENAME=Karate-DEV/' .env 2>/dev/null || true
|
||||||
|
MW_DB_NAME="$(grep '^MW_DB_NAME=' .env | cut -d= -f2-)"
|
||||||
|
MW_DB_ROOT_PASSWORD="$(grep '^MW_DB_ROOT_PASSWORD=' .env | cut -d= -f2-)"
|
||||||
|
MW_DB_PREFIX="$(grep '^MW_DB_PREFIX=' .env | cut -d= -f2-)"
|
||||||
|
|
||||||
|
docker compose -f docker-compose.dev-env.yml build mediawiki
|
||||||
docker compose -f docker-compose.dev-env.yml up -d db
|
docker compose -f docker-compose.dev-env.yml up -d db
|
||||||
# Warte auf MariaDB und initialisiere Schema falls DB noch leer ist
|
# Warte auf MariaDB
|
||||||
for i in $(seq 1 20); do
|
for i in $(seq 1 20); do
|
||||||
if docker compose -f docker-compose.dev-env.yml exec -T db healthcheck.sh --connect --innodb_initialized >/dev/null 2>&1; then
|
if docker compose -f docker-compose.dev-env.yml exec -T db healthcheck.sh --connect --innodb_initialized >/dev/null 2>&1; then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
|
|
||||||
docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php /usr/local/bin/ensure-db-schema.php
|
docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php /usr/local/bin/ensure-db-schema.php
|
||||||
|
|
||||||
|
# SSH-Hilfsfunktion vorbereiten falls DB oder verdrahtete Medien noch fehlen
|
||||||
|
SSH_KEY_FILE=""
|
||||||
|
cleanup_key() {
|
||||||
|
if [ -n "${TEMP_KEY:-}" ] && [ -f "${TEMP_KEY:-}" ]; then
|
||||||
|
rm -f "$TEMP_KEY"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup_key EXIT
|
||||||
|
|
||||||
|
if [ -n "${DEPLOY_SSH_KEY:-}" ]; then
|
||||||
|
TEMP_KEY="$(mktemp)"
|
||||||
|
chmod 600 "$TEMP_KEY"
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY" > "$TEMP_KEY"
|
||||||
|
SSH_KEY_FILE="$TEMP_KEY"
|
||||||
|
elif [ -f "$HOME/.ssh/strato_fewo" ]; then
|
||||||
|
SSH_KEY_FILE="$HOME/.ssh/strato_fewo"
|
||||||
|
fi
|
||||||
|
|
||||||
|
STRATO_HOST="51539426.ssh.w1.strato.hosting"
|
||||||
|
STRATO_USER="stu100093250"
|
||||||
|
if [ -n "$SSH_KEY_FILE" ]; then
|
||||||
|
mkdir -p "$HOME/.ssh"
|
||||||
|
ssh-keyscan -H "$STRATO_HOST" >> "$HOME/.ssh/known_hosts" 2>/dev/null || true
|
||||||
|
SSH_OPTS=(-i "$SSH_KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=accept-new)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 1. Pruefe, ob bereits echte Wiki-Seiten aus Strato importiert wurden
|
||||||
|
PAGE_COUNT="$(docker compose -f docker-compose.dev-env.yml exec -T db mariadb -N -B -u root -p"${MW_DB_ROOT_PASSWORD}" "$MW_DB_NAME" -e "SELECT COUNT(*) FROM ${MW_DB_PREFIX}page;" 2>/dev/null | tr -d ' \r\n' || echo 0)"
|
||||||
|
echo "Aktuelle Seitenanzahl in Dev-DB: ${PAGE_COUNT:-0}"
|
||||||
|
|
||||||
|
if [ "${PAGE_COUNT:-0}" -lt 10 ] && [ -n "$SSH_KEY_FILE" ]; then
|
||||||
|
DUMP_FILE="$TARGET/backups/db-init/01-karatewiki.sql"
|
||||||
|
echo "[Strato-Sync] Ziehe aktuellen MySQL-Dump von Strato (rein lesend)..."
|
||||||
|
ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" \
|
||||||
|
'/opt/RZphp84/bin/php-cli -r '\''$c=file_get_contents("Karate_Wiki_135/LocalSettings.php");preg_match("/wgDBpassword\s*=\s*\"([^\"]+)\"/",$c,$m);passthru(sprintf("mysqldump --single-transaction --no-tablespaces --default-character-set=binary -h rdbms.strato.de -u dbu1061679 -p%s dbs1754262",escapeshellarg($m[1])));'\''' \
|
||||||
|
> "$DUMP_FILE"
|
||||||
|
echo " Dump gespeichert ($(du -h "$DUMP_FILE" | cut -f1))."
|
||||||
|
|
||||||
|
echo "[Strato-Sync] Spiele Datenbank-Dump in MariaDB ($MW_DB_NAME) ein..."
|
||||||
|
docker compose -f docker-compose.dev-env.yml exec -T db \
|
||||||
|
mariadb -u root -p"${MW_DB_ROOT_PASSWORD}" --default-character-set=binary "$MW_DB_NAME" < "$DUMP_FILE"
|
||||||
|
echo " Datenbank erfolgreich importiert!"
|
||||||
|
fi
|
||||||
|
|
||||||
docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php maintenance/run.php update --quick
|
docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php maintenance/run.php update --quick
|
||||||
|
docker compose -f docker-compose.dev-env.yml run --rm --no-deps mediawiki php maintenance/run.php /var/www/html/scripts/migrate-html5media-tags.php
|
||||||
if ! docker compose -f docker-compose.dev-env.yml up -d --wait; then
|
if ! docker compose -f docker-compose.dev-env.yml up -d --wait; then
|
||||||
echo "compose up --wait failed — mediawiki logs:"
|
echo "compose up --wait failed — mediawiki logs:"
|
||||||
docker compose -f docker-compose.dev-env.yml logs mediawiki --tail 150 || true
|
docker compose -f docker-compose.dev-env.yml logs mediawiki --tail 150 || true
|
||||||
docker compose -f docker-compose.dev-env.yml ps || true
|
docker compose -f docker-compose.dev-env.yml ps || true
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 2. Pruefe, ob bereits alle 566 verdrahteten Mediendateien (4.79 GB) synchronisiert wurden
|
||||||
|
if ! docker compose -f docker-compose.dev-env.yml exec -T mediawiki test -f /var/www/html/images/.strato_linked_synced; then
|
||||||
|
if [ -n "$SSH_KEY_FILE" ]; then
|
||||||
|
echo "=== Pruefe freien Speicherplatz auf dem Raspberry Pi vor dem 4.79 GB Medien-Sync ==="
|
||||||
|
df -h /home/lars
|
||||||
|
AVAIL_MB="$(df -BM --output=avail /home/lars | tail -n 1 | tr -d ' M\r\n')"
|
||||||
|
echo "Verfuegbarer Speicherplatz auf dem Raspberry Pi: ${AVAIL_MB} MB"
|
||||||
|
if [ "${AVAIL_MB:-0}" -lt 8000 ]; then
|
||||||
|
echo "WARNUNG: Weniger als 8000 MB frei (${AVAIL_MB} MB) – ueberspringe 4.79 GB Voll-Sync zum Schutz des Raspberry Pi!"
|
||||||
|
else
|
||||||
|
echo "Genug Speicherplatz frei (${AVAIL_MB} MB >= 8000 MB). Starte Sync aller 566 verdrahteten Dateien (4.79 GB)..."
|
||||||
|
ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" '/opt/RZphp84/bin/php-cli' < scripts/stream-linked-images.php \
|
||||||
|
| docker compose -f docker-compose.dev-env.yml exec -T mediawiki tar -xf - -C /var/www/html/images/
|
||||||
|
docker compose -f docker-compose.dev-env.yml exec -T mediawiki touch /var/www/html/images/.strato_linked_synced
|
||||||
|
docker compose -f docker-compose.dev-env.yml exec -T mediawiki chown -R www-data:www-data /var/www/html/images
|
||||||
|
echo "Alle 566 verdrahteten Mediendateien erfolgreich synchronisiert!"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Medien-Check: Alle 566 verdrahteten Dateien sind bereits im Volume vorhanden (.strato_linked_synced)."
|
||||||
|
fi
|
||||||
|
|
||||||
if ! curl -sf "http://localhost:3093/api.php?action=query&meta=siteinfo&format=json" >/dev/null; then
|
if ! curl -sf "http://localhost:3093/api.php?action=query&meta=siteinfo&format=json" >/dev/null; then
|
||||||
echo "DEV MediaWiki API not reachable — logs:"
|
echo "DEV MediaWiki API not reachable — logs:"
|
||||||
docker compose -f docker-compose.dev-env.yml logs mediawiki --tail 150 || true
|
docker compose -f docker-compose.dev-env.yml logs mediawiki --tail 150 || true
|
||||||
@@ -67,4 +152,3 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
echo "DEV MediaWiki API OK (http://192.168.2.49:3093)"
|
echo "DEV MediaWiki API OK (http://192.168.2.49:3093)"
|
||||||
echo "=== Karatewiki DEV deploy complete ==="
|
echo "=== Karatewiki DEV deploy complete ==="
|
||||||
|
|
||||||
@@ -8,21 +8,28 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Deploy Karatewiki to production standby (Raspberry Pi 5)
|
- name: Deploy Karatewiki to Strato (~/Karatewiki) & Pi Standby
|
||||||
|
env:
|
||||||
|
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
echo "=== Deploying Karatewiki to PRODUCTION (Pi Standby) ==="
|
echo "=== [1/2] Deploying Karatewiki to PRODUCTION Standby (Raspberry Pi 5) ==="
|
||||||
REPO="http://192.168.2.144:3000/Lars/karatewiki.git"
|
REPO="http://192.168.2.144:3000/Lars/karatewiki.git"
|
||||||
TARGET="/home/lars/docker/karatewiki"
|
TARGET="/home/lars/docker/karatewiki"
|
||||||
mkdir -p "$TARGET/backups/db-init"
|
mkdir -p "$TARGET"
|
||||||
cd "$TARGET"
|
cd "$TARGET"
|
||||||
if [ ! -d .git ]; then
|
if [ ! -d .git ]; then
|
||||||
git clone -b main "$REPO" .
|
git init
|
||||||
else
|
|
||||||
git fetch origin main
|
|
||||||
git checkout main
|
|
||||||
git reset --hard origin/main
|
|
||||||
fi
|
fi
|
||||||
|
if git remote get-url origin >/dev/null 2>&1; then
|
||||||
|
git remote set-url origin "$REPO"
|
||||||
|
else
|
||||||
|
git remote add origin "$REPO"
|
||||||
|
fi
|
||||||
|
git fetch origin main
|
||||||
|
git checkout -B main origin/main
|
||||||
|
git reset --hard origin/main
|
||||||
|
mkdir -p "$TARGET/backups/db-init"
|
||||||
if [ ! -f .env ]; then
|
if [ ! -f .env ]; then
|
||||||
umask 077
|
umask 077
|
||||||
PASS="$(od -An -N24 -tx1 /dev/urandom | tr -d ' \n')"
|
PASS="$(od -An -N24 -tx1 /dev/urandom | tr -d ' \n')"
|
||||||
@@ -46,7 +53,7 @@ jobs:
|
|||||||
echo "created $TARGET/.env (passwords not logged)"
|
echo "created $TARGET/.env (passwords not logged)"
|
||||||
umask 022
|
umask 022
|
||||||
fi
|
fi
|
||||||
docker compose build --no-cache mediawiki
|
docker compose build mediawiki
|
||||||
docker compose up -d db
|
docker compose up -d db
|
||||||
for i in $(seq 1 20); do
|
for i in $(seq 1 20); do
|
||||||
if docker compose exec -T db healthcheck.sh --connect --innodb_initialized >/dev/null 2>&1; then
|
if docker compose exec -T db healthcheck.sh --connect --innodb_initialized >/dev/null 2>&1; then
|
||||||
@@ -56,6 +63,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
docker compose run --rm --no-deps mediawiki php /usr/local/bin/ensure-db-schema.php
|
docker compose run --rm --no-deps mediawiki php /usr/local/bin/ensure-db-schema.php
|
||||||
docker compose run --rm --no-deps mediawiki php maintenance/run.php update --quick
|
docker compose run --rm --no-deps mediawiki php maintenance/run.php update --quick
|
||||||
|
docker compose run --rm --no-deps mediawiki php maintenance/run.php /var/www/html/scripts/migrate-html5media-tags.php
|
||||||
if ! docker compose up -d --wait; then
|
if ! docker compose up -d --wait; then
|
||||||
echo "compose up --wait failed — mediawiki logs:"
|
echo "compose up --wait failed — mediawiki logs:"
|
||||||
docker compose logs mediawiki --tail 150 || true
|
docker compose logs mediawiki --tail 150 || true
|
||||||
@@ -67,6 +75,63 @@ jobs:
|
|||||||
docker compose logs mediawiki --tail 150 || true
|
docker compose logs mediawiki --tail 150 || true
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "PROD MediaWiki API OK (http://192.168.2.49:3008)"
|
echo "PROD Standby MediaWiki API OK (http://192.168.2.49:3008)"
|
||||||
echo "=== Karatewiki PROD deploy complete ==="
|
|
||||||
|
|
||||||
|
echo "=== [2/2] Deploying Karatewiki Config & Extensions to Strato (~/Karatewiki) ==="
|
||||||
|
SSH_KEY_FILE=""
|
||||||
|
cleanup_key() {
|
||||||
|
if [ -n "${TEMP_KEY:-}" ] && [ -f "${TEMP_KEY:-}" ]; then
|
||||||
|
rm -f "$TEMP_KEY"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup_key EXIT
|
||||||
|
|
||||||
|
if [ -n "${DEPLOY_SSH_KEY:-}" ]; then
|
||||||
|
TEMP_KEY="$(mktemp)"
|
||||||
|
chmod 600 "$TEMP_KEY"
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY" > "$TEMP_KEY"
|
||||||
|
SSH_KEY_FILE="$TEMP_KEY"
|
||||||
|
elif [ -f "$HOME/.ssh/strato_fewo" ]; then
|
||||||
|
SSH_KEY_FILE="$HOME/.ssh/strato_fewo"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$SSH_KEY_FILE" ]; then
|
||||||
|
STRATO_HOST="51539426.ssh.w1.strato.hosting"
|
||||||
|
STRATO_USER="stu100093250"
|
||||||
|
mkdir -p "$HOME/.ssh"
|
||||||
|
ssh-keyscan -H "$STRATO_HOST" >> "$HOME/.ssh/known_hosts" 2>/dev/null || true
|
||||||
|
SSH_OPTS=(-i "$SSH_KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=accept-new)
|
||||||
|
|
||||||
|
tar -czf - \
|
||||||
|
config/LocalSettings.php \
|
||||||
|
config/php-uploads.ini \
|
||||||
|
scripts/migrate-html5media-tags.php \
|
||||||
|
assets/ \
|
||||||
|
extensions-custom/KarateMedia/ \
|
||||||
|
| ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" '
|
||||||
|
set -e
|
||||||
|
TMP_DEPLOY=~/karatewiki-shared/tmp_deploy
|
||||||
|
rm -rf "$TMP_DEPLOY"
|
||||||
|
mkdir -p "$TMP_DEPLOY"
|
||||||
|
tar -xzf - -C "$TMP_DEPLOY"
|
||||||
|
cp "$TMP_DEPLOY/config/LocalSettings.php" ~/Karatewiki/LocalSettings.php
|
||||||
|
cp "$TMP_DEPLOY/config/php-uploads.ini" ~/Karatewiki/php.ini
|
||||||
|
cp "$TMP_DEPLOY/config/php-uploads.ini" ~/Karatewiki/.user.ini
|
||||||
|
mkdir -p ~/Karatewiki/scripts
|
||||||
|
cp "$TMP_DEPLOY/scripts/migrate-html5media-tags.php" ~/Karatewiki/scripts/migrate-html5media-tags.php
|
||||||
|
cp -r "$TMP_DEPLOY/assets/"* ~/Karatewiki/resources/assets/
|
||||||
|
cp "$TMP_DEPLOY/assets/manifest.webmanifest" ~/Karatewiki/manifest.webmanifest
|
||||||
|
cp "$TMP_DEPLOY/assets/sw.js" ~/Karatewiki/sw.js
|
||||||
|
rm -rf ~/Karatewiki/extensions/KarateMedia
|
||||||
|
cp -r "$TMP_DEPLOY/extensions-custom/KarateMedia" ~/Karatewiki/extensions/KarateMedia
|
||||||
|
rm -rf "$TMP_DEPLOY"
|
||||||
|
if ! grep -q "manifest+json" ~/Karatewiki/.htaccess 2>/dev/null; then
|
||||||
|
printf "\nAddType application/manifest+json .webmanifest\nAddType image/svg+xml .svg\n" >> ~/Karatewiki/.htaccess
|
||||||
|
fi
|
||||||
|
/opt/RZphp84/bin/php-cli ~/Karatewiki/maintenance/run.php update --quick
|
||||||
|
/opt/RZphp84/bin/php-cli ~/Karatewiki/maintenance/run.php ~/Karatewiki/scripts/migrate-html5media-tags.php
|
||||||
|
'
|
||||||
|
echo "=== Strato ~/Karatewiki erfolgreich aktualisiert! ==="
|
||||||
|
else
|
||||||
|
echo "WARNUNG: Kein DEPLOY_SSH_KEY gefunden – Strato-Update uebersprungen."
|
||||||
|
fi
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
name: Sync from Strato
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
target_env:
|
||||||
|
description: "Ziel-Umgebung auf dem Raspberry Pi 5"
|
||||||
|
required: true
|
||||||
|
default: "development"
|
||||||
|
type: choice
|
||||||
|
options:
|
||||||
|
- development
|
||||||
|
- production
|
||||||
|
sync_mode:
|
||||||
|
description: "Was soll (rein lesend) von Strato geholt werden?"
|
||||||
|
required: true
|
||||||
|
default: "db_and_samples"
|
||||||
|
type: choice
|
||||||
|
options:
|
||||||
|
- db_and_samples
|
||||||
|
- db_only
|
||||||
|
- db_and_all_images
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Sync Database & Media from Strato (Read-Only) to Raspberry Pi
|
||||||
|
env:
|
||||||
|
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
|
TARGET_ENV: ${{ inputs.target_env || 'development' }}
|
||||||
|
SYNC_MODE: ${{ inputs.sync_mode || 'db_and_samples' }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
STRATO_HOST="51539426.ssh.w1.strato.hosting"
|
||||||
|
STRATO_USER="stu100093250"
|
||||||
|
|
||||||
|
if [ "$TARGET_ENV" = "production" ]; then
|
||||||
|
TARGET="/home/lars/docker/karatewiki"
|
||||||
|
COMPOSE_FILE="docker-compose.yml"
|
||||||
|
else
|
||||||
|
TARGET="/home/lars/docker/karatewiki-dev"
|
||||||
|
COMPOSE_FILE="docker-compose.dev-env.yml"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "=== Starte Read-Only Sync von Strato nach $TARGET ($SYNC_MODE) ==="
|
||||||
|
cd "$TARGET"
|
||||||
|
MW_DB_NAME="$(grep '^MW_DB_NAME=' .env | cut -d= -f2-)"
|
||||||
|
MW_DB_ROOT_PASSWORD="$(grep '^MW_DB_ROOT_PASSWORD=' .env | cut -d= -f2-)"
|
||||||
|
|
||||||
|
SSH_KEY_FILE=""
|
||||||
|
cleanup_key() {
|
||||||
|
if [ -n "${TEMP_KEY:-}" ] && [ -f "${TEMP_KEY:-}" ]; then
|
||||||
|
rm -f "$TEMP_KEY"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup_key EXIT
|
||||||
|
|
||||||
|
if [ -n "${DEPLOY_SSH_KEY:-}" ]; then
|
||||||
|
TEMP_KEY="$(mktemp)"
|
||||||
|
chmod 600 "$TEMP_KEY"
|
||||||
|
printf '%s\n' "$DEPLOY_SSH_KEY" > "$TEMP_KEY"
|
||||||
|
SSH_KEY_FILE="$TEMP_KEY"
|
||||||
|
echo "Nutze SSH-Key aus Gitea Secret DEPLOY_SSH_KEY."
|
||||||
|
elif [ -f "$HOME/.ssh/strato_fewo" ]; then
|
||||||
|
SSH_KEY_FILE="$HOME/.ssh/strato_fewo"
|
||||||
|
echo "Nutze lokalen SSH-Key $SSH_KEY_FILE."
|
||||||
|
else
|
||||||
|
echo "FEHLER: Weder Gitea Secret DEPLOY_SSH_KEY gesetzt noch ~/.ssh/strato_fewo auf dem Pi gefunden!" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$HOME/.ssh"
|
||||||
|
ssh-keyscan -H "$STRATO_HOST" >> "$HOME/.ssh/known_hosts" 2>/dev/null || true
|
||||||
|
SSH_OPTS=(-i "$SSH_KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=accept-new)
|
||||||
|
|
||||||
|
# 1. Datenbank-Dump rein lesend von Strato ziehen
|
||||||
|
mkdir -p "$TARGET/backups/db-init"
|
||||||
|
DUMP_FILE="$TARGET/backups/db-init/01-karatewiki.sql"
|
||||||
|
echo "[1/4] Ziehe aktuellen MySQL-Dump von Strato (rein lesend)..."
|
||||||
|
ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" \
|
||||||
|
'/opt/RZphp84/bin/php-cli -r '\''$c=file_get_contents("Karate_Wiki_135/LocalSettings.php");preg_match("/wgDBpassword\s*=\s*\"([^\"]+)\"/",$c,$m);passthru(sprintf("mysqldump --single-transaction --no-tablespaces --default-character-set=binary -h rdbms.strato.de -u dbu1061679 -p%s dbs1754262",escapeshellarg($m[1])));'\''' \
|
||||||
|
> "$DUMP_FILE"
|
||||||
|
echo " Dump gespeichert ($(du -h "$DUMP_FILE" | cut -f1))."
|
||||||
|
|
||||||
|
# 2. Dump in MariaDB-Container einspielen
|
||||||
|
echo "[2/4] Spiele Datenbank-Dump in MariaDB ($MW_DB_NAME) ein..."
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T db \
|
||||||
|
mariadb -u root -p"${MW_DB_ROOT_PASSWORD}" --default-character-set=binary "$MW_DB_NAME" < "$DUMP_FILE"
|
||||||
|
echo " Datenbank erfolgreich importiert."
|
||||||
|
|
||||||
|
# 3. MediaWiki Schema-Update (1.35.1 -> 1.43 LTS) ausfuehren
|
||||||
|
echo "[3/4] Fuehre MediaWiki Datenbank-Migration (update.php) auf 1.43 LTS aus..."
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T mediawiki \
|
||||||
|
php maintenance/run.php update --quick
|
||||||
|
|
||||||
|
# 4. Mediendateien (Beispiel-Videos oder alle 8.3 GB) synchronisieren
|
||||||
|
if [ "$SYNC_MODE" = "db_and_samples" ]; then
|
||||||
|
echo "[4/4] Kopiere Beispiel-Videos (Seienchin & Tensho) zum Testen von Strato..."
|
||||||
|
ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" \
|
||||||
|
'cd Karate_Wiki_135/images && FILES=$(find . -type f \( -iname "*Seienchin*.mp4" -o -iname "*Tensho*.mp4" -o -iname "*Shisoshin*.mp4" -o -name ".htaccess" \) | head -n 15) && tar -cf - $FILES' \
|
||||||
|
| docker compose -f "$COMPOSE_FILE" exec -T mediawiki tar -xf - -C /var/www/html/images/
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T mediawiki chown -R www-data:www-data /var/www/html/images
|
||||||
|
echo " Beispiel-Videos erfolgreich in den Container kopiert!"
|
||||||
|
elif [ "$SYNC_MODE" = "db_and_all_images" ]; then
|
||||||
|
echo "[4/4] Synchronisiere kompletten images/-Ordner (ca. 8.3 GB) von Strato..."
|
||||||
|
ssh "${SSH_OPTS[@]}" "${STRATO_USER}@${STRATO_HOST}" \
|
||||||
|
'cd Karate_Wiki_135/images && tar -cf - .' \
|
||||||
|
| docker compose -f "$COMPOSE_FILE" exec -T mediawiki tar -xf - -C /var/www/html/images/
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T mediawiki chown -R www-data:www-data /var/www/html/images
|
||||||
|
echo " Kompletter images/-Ordner synchronisiert!"
|
||||||
|
else
|
||||||
|
echo "[4/4] Mediendateien uebersprungen (Modus: db_only)."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "=== Sync von Strato erfolgreich abgeschlossen! ==="
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# Karatewiki (Goju-Kai Dojo) – Agenten-Leitfaden
|
# Karatewiki (Goju-Kai Dojo) – Agenten-Leitfaden
|
||||||
|
|
||||||
Dieses Repository verwaltet die MediaWiki-Konfiguration ([`config/LocalSettings.php`](config/LocalSettings.php)), das Docker-Setup (MediaWiki 1.43 LTS + MariaDB 11.8) und unsere eigenen Erweiterungen ([`extensions-custom/KarateMedia`](extensions-custom/KarateMedia)) für das Vereins-Wiki des Goju-Kai Dojo (`https://www.gojukai-dojo.de`).
|
Dieses Repository verwaltet die MediaWiki-Konfiguration ([`config/LocalSettings.php`](config/LocalSettings.php)), das Docker-Setup (MediaWiki 1.46 + MariaDB 11.8) und unsere eigenen Erweiterungen ([`extensions-custom/KarateMedia`](extensions-custom/KarateMedia)) für das Vereins-Wiki des Goju-Kai Dojo (`https://www.gojukai-dojo.de`).
|
||||||
|
|
||||||
## 📚 Pflichtlektüre beim Start einer neuen Session (z.B. auf einem anderen PC)
|
## 📚 Pflichtlektüre beim Start einer neuen Session (z.B. auf einem anderen PC)
|
||||||
|
|
||||||
@@ -11,6 +11,6 @@ Dieses Repository verwaltet die MediaWiki-Konfiguration ([`config/LocalSettings.
|
|||||||
|
|
||||||
1. **Strato-Produktivsystem niemals ungefragt verändern:** Auf `51539426.ssh.w1.strato.hosting` (`Karate_Wiki_135`) darf ohne ausdrückliche Freigabe nur **lesend (`read-only`)** zugegriffen werden.
|
1. **Strato-Produktivsystem niemals ungefragt verändern:** Auf `51539426.ssh.w1.strato.hosting` (`Karate_Wiki_135`) darf ohne ausdrückliche Freigabe nur **lesend (`read-only`)** zugegriffen werden.
|
||||||
2. **Kein MediaWiki-Core und keine Mediendateien ins Git:** Weder der MediaWiki-Core noch Passwörter (`.env`), Datenbank-Dumps (`*.sql`) oder der `images/`-Ordner (8,3 GB Videos) gehören in dieses Repository.
|
2. **Kein MediaWiki-Core und keine Mediendateien ins Git:** Weder der MediaWiki-Core noch Passwörter (`.env`), Datenbank-Dumps (`*.sql`) oder der `images/`-Ordner (8,3 GB Videos) gehören in dieses Repository.
|
||||||
3. **Branch- & Deployment-Modell:**
|
3. **Striktes Branch- & Deployment-Modell:**
|
||||||
- Gearbeitet wird auf `develop`. Ein Push auf `develop` startet über den Gitea-Runner automatisch das Deployment auf dem Raspberry Pi 5 (`/home/lars/docker/karatewiki-dev`, Port `3093`).
|
- **Ausschließlicher Push auf `develop`:** Von der lokalen Entwicklungsumgebung aus darf **nur** auf den `develop`-Branch committed und gepusht werden (`git push origin develop`). Ein Push auf `develop` startet über den Gitea-Runner (`Raspi5-Paperless`) automatisch das Deployment nach `/home/lars/docker/karatewiki-dev` (Port `3093`).
|
||||||
- Ein Merge nach `main` (`git merge --no-ff develop`) startet das Production-/Standby-Deployment (`/home/lars/docker/karatewiki`, Port `3008`).
|
- **Kein lokaler Push auf `main`:** Der Merge von `develop` nach `main` wird **ausschließlich manuell durch den Benutzer direkt in Gitea** ausgelöst (damit `develop` und `main` bewusst getrennte Reifegrade behalten).
|
||||||
+17
-9
@@ -1,25 +1,33 @@
|
|||||||
# ============================================================================
|
# ============================================================================
|
||||||
# Karate-Wiki Dockerfile (Multi-Arch: laeuft nativ auf Raspberry Pi 5 ARM64)
|
# Karate-Wiki Dockerfile (Multi-Arch: laeuft nativ auf Raspberry Pi 5 ARM64)
|
||||||
# Standardmaessig auf MediaWiki 1.43 LTS (kompatibel mit PHP 8.3 / 8.4)
|
# Nutzt das neueste offizielle Release MediaWiki 1.46 (1.46.2, PHP 8.3/8.4)
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
ARG MW_VERSION=1.43
|
ARG MW_VERSION=1.46
|
||||||
FROM mediawiki:${MW_VERSION}
|
FROM mediawiki:${MW_VERSION}
|
||||||
|
|
||||||
# Pakete fuer Video-Vorschaubilder (ffmpeg) & Bildverarbeitung installieren
|
# Pakete fuer Video-Vorschaubilder (ffmpeg) & Bildverarbeitung + MsUpload (Mehrfach-Upload im Editor)
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
imagemagick \
|
imagemagick \
|
||||||
unzip \
|
unzip \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
|
&& mkdir -p /var/www/html/extensions/MsUpload \
|
||||||
|
&& curl -fsSL "https://codeload.github.com/wikimedia/mediawiki-extensions-MsUpload/tar.gz/refs/heads/master" \
|
||||||
|
| tar -xz --strip-components=1 -C /var/www/html/extensions/MsUpload \
|
||||||
|
&& mkdir -p /var/www/html/cache \
|
||||||
|
&& chown -R www-data:www-data /var/www/html/cache
|
||||||
|
|
||||||
# PHP Upload-Limits fuer grosse Karate-Videos (500 MB)
|
# PHP Upload-Limits fuer grosse Karate-Videos (500 MB) & Mehrfach-Uploads
|
||||||
COPY config/php-uploads.ini /usr/local/etc/php/conf.d/zz-karate-uploads.ini
|
COPY config/php-uploads.ini /usr/local/etc/php/conf.d/zz-karate-uploads.ini
|
||||||
|
|
||||||
# Vereins-Logo ins Image kopieren
|
# Vereins-Logos & Favicon ins Image kopieren
|
||||||
COPY assets/logo_goju-kai_Bleistift.png /var/www/html/resources/assets/logo_goju-kai_Bleistift.png
|
COPY assets/ /var/www/html/resources/assets/
|
||||||
|
COPY assets/manifest.webmanifest /var/www/html/manifest.webmanifest
|
||||||
|
COPY assets/sw.js /var/www/html/sw.js
|
||||||
|
|
||||||
# DB-Initialisierungshilfe fuer Erst-Deployments auf dem Raspberry Pi
|
# DB-Initialisierungshilfe & Tag-Migration fuer Deployments
|
||||||
COPY scripts/ensure-db-schema.php /usr/local/bin/ensure-db-schema.php
|
COPY scripts/ensure-db-schema.php /usr/local/bin/ensure-db-schema.php
|
||||||
|
COPY scripts/migrate-html5media-tags.php /var/www/html/scripts/migrate-html5media-tags.php
|
||||||
|
|
||||||
# Unsere eigene, wartungsfreie Video-Extension (ersetzt Html5mediator & EmbedVideo)
|
# Unsere eigene, wartungsfreie Video- & Vereins-Extension
|
||||||
COPY extensions-custom/KarateMedia /var/www/html/extensions/KarateMedia
|
COPY extensions-custom/KarateMedia /var/www/html/extensions/KarateMedia
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
@@ -0,0 +1,8 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-300 11 290 290" width="512" height="512">
|
||||||
|
<circle cx="-155" cy="156" r="142" fill="#1a1a1a"/>
|
||||||
|
<circle cx="-155" cy="156" r="138" fill="none" stroke="#e41b1b" stroke-width="4"/>
|
||||||
|
<g id="emblem">
|
||||||
|
<path transform="matrix(2.7597,0,0,2.7597,-2559.1,-2310.8)" d="m889.8 927.81c3.2706-0.29307 6.868-1.2628 8.5108-4.3952 1.5107-1.2233-0.1487-4.5881 1.6857-4.8747 2.8031-0.14022 6.4278-0.48065 7.2812-3.7317 2.0351-4.9446 1.281-10.41 1.1584-15.609-0.59189-3.4897-1.6954-6.9124-1.4546-10.503 0.0597-3.6618-0.42792-7.9533-3.8957-10.026-2.8973-1.6072-6.4295-1.3778-9.6372-1.856-10.748-0.28444-16.077 0.68551-26.801 0.80615-3.5946-0.26156-12.703-0.77348-16.212-1.681-0.73019-2.9195-0.22814-6.1528-0.44946-9.193 0.49707-2.3022-0.51587-4.3898-2.9962-3.6834-2.7194 0.0629-5.4778-0.16957-8.1648 0.16713-1.2576 2.9302-0.28643 6.6583-0.6021 9.9069 0.0247 14.302-0.0775 28.605 0.0661 42.906 1.7992 2.5699 6.539 0.56903 9.5046 1.1919 3.9347 0.13346 1.4074-5.5572 2.1676-7.9772l0.0408-6.8157c3.1586 0.22789 3.7244 3.9363 5.2334 6.1008 0.89381 2.1894 3.2953 3.1175 4.7256 4.9118 3.559 2.0851 7.602 3.2912 11.244 5.2657 3.1422 1.5946 5.9347 3.7305 8.8507 5.6984 2.798 2.1026 6.0572 4.2709 9.7444 3.3923z" fill="#e41b1b" style="paint-order:normal"/>
|
||||||
|
<path transform="matrix(2.7597,0,0,2.7597,-2582,-2319.5)" d="m898.11 930.96c3.2706-0.29307 6.868-1.2628 8.5108-4.3952 1.5107-1.2233-0.1487-4.5881 1.6857-4.8747 2.8031-0.14022 6.4278-0.48065 7.2812-3.7317 2.0351-4.9446 1.281-10.41 1.1584-15.609-0.59189-3.4897-1.6954-6.9124-1.4546-10.503 0.0597-3.6618-0.42792-7.9533-3.8957-10.026-2.8973-1.6072-6.4295-1.3778-9.6372-1.856-10.748-0.28444-16.077 0.68551-26.801 0.80615-3.5946-0.26156-12.703-0.77348-16.212-1.681-0.73019-2.9195-0.22814-6.1528-0.44946-9.193 0.49707-2.3022-0.51587-4.3898-2.9962-3.6834-2.7194 0.0629-5.4778-0.16957-8.1648 0.16713-1.2576 2.9302-0.28643 6.6583-0.6021 9.9069 0.0247 14.302-0.0775 28.605 0.0661 42.906 1.7992 2.5699 6.539 0.56903 9.5046 1.1919 3.9347 0.13346 1.4074-5.5572 2.1676-7.9772l0.0408-6.8157c3.1586 0.22789 3.7244 3.9363 5.2334 6.1008 0.89381 2.1894 3.2953 3.1175 4.7256 4.9118 3.559 2.0851 7.602 3.2912 11.244 5.2657 3.1422 1.5946 5.9347 3.7305 8.8507 5.6984 2.798 2.1026 6.0572 4.2709 9.7444 3.3923zm-4.2356-1.1075c-6.1238-2.6618-10.776-7.879-17.029-10.342-3.3417-1.392-5.7739-4.363-7.4412-7.4762-0.12545-1.2216-2.6781-5.7328-1.6073-2.0842 0.13833 2.1363 3.8761 5.7534 2.8197 6.831-2.5954-1.8107-5.408-3.7328-6.8081-6.6769-1.0133-2.5808-3.026-5.0697-5.5385-5.8434 0.0373-7.9015-0.0964-15.81 0.1078-23.706 7.5871 0.52138 15.028 1.5741 22.637 1.0397 8.4716-0.28456 17.161-1.1725 25.603-0.19474 2.9478 1.5673 4.155 5.3727 4.5621 8.5191 0.42706 7.133 1.1136 14.248 1.5932 21.376-0.3776 3.052 0.0234 7.9851-3.5213 9.057-1.8582 0.56377-3.4512-0.34482-5.0606-1.139-3.1474-1.1229-4.99-4.1978-7.2183-6.5083-0.58141-2.7425 1.9306-8.3926 4.5485-3.8126 0.14185 1.5896 3.7394 4.4858 2.1623 1.474-1.8492-2.5477-5.1467-5.637-3.1247-9.0141 1.0089-1.1572 3.1787-4.8696 0.35391-2.1259-2.6275 2.3217-6.9524-2.2485-4.5886-4.9414 0.25618-2.1959 3.7667-4.6121 3.4507-5.88-3.8156 1.5369-4.4773 5.9064-5.8983 9.2696-1.181 2.3121-1.8917 6.6449-3.8085 7.4723-0.88908-2.9678-0.64528-6.6367 1.0723-9.2898-0.50237-1.4173-3.1342 3.0579-2.8025 4.6344-0.67883 3.6991 1.635 6.853 4.1813 9.2403 2.6764 2.704 5.5864 5.4115 7.2321 8.8928-0.6237 1.9981-1.9586 4.5212-3.561 6.289-0.6896 0.89153-5.4004 4.48-1.9289 3.0074 2.4506-2.3167 4.9343-4.9218 5.8274-8.2414 0.98835 1.9414-0.0101 4.7647-0.71895 6.7867-0.97499 1.8456-3.1835 4.253-5.4964 3.3868zm2.9477-2.4335c1.3108-0.62375 3.5229-5.3532 0.96738-2.2975-0.72209 0.57619-3.5452 4.2067-0.96738 2.2975zm-12.164-4.9867c0.7369-2.9859 4.6779-2.8278 5.953-4.5216-2.6496-0.62817-7.766 2.7859-6.232 4.8665l0.27901-0.34488zm-5.1683-8.0926c0.18168-1.2358-1.3431-6.0456-1.3562-2.4478-0.18619 0.63534 0.91989 3.617 1.3562 2.4478zm2.8664-1.005c-1.041-1.5403 0.653-5.126-1.3116-5.1416-0.0494 1.4093-0.28059 5.3596 1.3116 5.1416zm6.5275-4.8398c-1.151-3.1035-1.99-6.3402-1.5867-9.6813-0.41496-2.5596 3.4546-5.5987 2.4808-7.4394-1.3363 0.34849-1.407 2.7405-2.2703 3.79-1.5876 3.2213-1.5408 7.0081-0.92116 10.456 0.41994 0.95697 0.83025 3.4502 2.2973 2.8743zm11.291-12.913c2.4566-2.2219 5.474-3.6566 7.9841-5.7513-2.0612 0.49018-5.61 2.1098-6.9641 4.0794-0.30561 0.33908-3.4938 2.462-1.02 1.6719zm-12.575-5.906c1.9614-2.2746 6.3902-2.8328 6.5289-6.3096-1.4836 2.2769-4.7065 3.4644-6.8512 5.4077-0.63275 0.28215-0.47734 1.5645 0.32223 0.90191zm11.684 40.038c0.32173-2.3899 2.732-6.4175 6.065-5.3006 2.0299 1.2505-2.014 5.6854-4.4188 5.25-0.54121 0.0647-1.1032 0.17422-1.6462 0.0506zm6.5901-6.6346c-1.6849-0.51716-5.2397 1.463-4.3067-1.5296-0.72901-3.464 3.5286-0.17472 4.9274 0.86822 0.11182 0.50575-0.0412 0.72503-0.62074 0.66133zm6.5789-3.2288c0.76509-3.0028 1.6914-6.1805 1.3417-9.3945-0.49588-5.1357-1.185-10.255-1.2778-15.425-0.35345-4.1456-0.22847-8.5594-2.2274-12.313 2.3552 0.36785 4.1547 3.9783 3.8482 6.5985-0.0954 3.8323 0.51278 7.5895 1.4682 11.289 0.90285 5.591 1.0886 11.514-0.56693 16.984-0.45032 0.93047-1.3162 2.6846-2.586 2.2606zm-64.881-0.50035c-0.47742-1.0484-0.0709-2.4628-0.20588-3.6531v-48.234c0.79529-0.86037 2.2166-0.20927 3.2844-0.41174h6.3687c0.8604 0.79526 0.20927 2.2166 0.41175 3.2844v48.809c-0.79528 0.86037-2.2166 0.20927-3.2844 0.41174h-6.3687l-0.13542-0.13542zm47.422-8.9154c-2.9342-1.6629-4.0207-5.1716-2.3101-8.1348 0.97121-5.1904 4.7965-0.18259 4.6889 2.6626 0.79363 1.556-0.85481 6.2062-2.3788 5.4721z" fill="#ffffff" style="paint-order:normal"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 5.4 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg width="339.27mm" height="77.524mm" version="1.1" viewBox="0 0 339.27 77.524" xmlns="http://www.w3.org/2000/svg"><path d="m105.36 68.103c-0.14781-0.76398-0.33978-2.163-0.42659-3.1088-0.3432-3.7394-0.32964-3.7042-1.4265-3.7042-0.53872 0-1.6652-0.17859-2.5032-0.39687s-1.5774-0.39688-1.6431-0.39688-0.11938 0.71438-0.11938 1.5875c0 1.6861 0.17143 1.8922 0.90217 1.0847 0.25026-0.27653 0.69032-0.56432 0.97792-0.63953 0.43497-0.11374 0.49343-0.0403 0.34766 0.43665-0.24684 0.80762-1.9524 3.8428-2.2695 4.0388-0.1449 0.0895-0.77225-0.0315-1.3941-0.26897-1.1165-0.42638-1.1399-0.46196-1.8673-2.8331-0.40514-1.3207-0.79352-2.9548-0.86307-3.6313-0.0695-0.67648-0.26747-1.349-0.43982-1.4946-0.17236-0.14552-0.47566-0.66253-0.674-1.1489-0.30719-0.75329-0.30536-0.91932 0.0123-1.1204 0.20512-0.12985 0.51638-0.23792 0.69169-0.24015 0.17531-2e-3 0.37723-0.391 0.44873-0.86394 0.0715-0.47295 0.19431-1.2766 0.27294-1.7859 0.0786-0.50933 0.42754-1.8736 0.77537-3.0318l0.63242-2.1058 1.6527-0.87617c1.2445-0.65974 1.7392-0.80441 2.0027-0.58569 0.24301 0.20167 0.27899 0.47724 0.11771 0.90144-0.23393 0.61527-0.79478 5.8854-0.79646 7.484l-9e-4 0.85989 1.9182-4e-3c1.055-2e-3 2.0601-0.0942 2.2334-0.20447 0.17337-0.11023 0.7272-1.0907 1.2307-2.1788 1.4845-3.2078 3.0336-6.6859 3.3322-7.4812 0.31189-0.83099 1.487-1.4301 3.2898-1.6772l1.1457-0.15703 0.17439 1.0227c0.1308 0.76709-0.37185 3.5954-2.0109 11.315l-2.1853 10.293-0.88877 0.3725c-0.55676 0.23335-0.9985 0.66319-1.1825 1.1506-0.48427 1.283-1.1549 1.0038-1.4673-0.61092zm132.45-1.1925-1.2539-1.2731 2.6e-4 -2.1076c5.3e-4 -3.4599 0.98026-11.2 2.0189-15.951 0.38212-1.7477 0.50708-1.977 1.2775-2.3444 0.75055-0.35792 1.1232-0.36363 3.0781-0.0472l2.2242 0.36003 2e-3 1.2548c2e-3 1.1525 0.0827 1.3097 0.99218 1.9278 0.54466 0.37011 0.99029 0.70734 0.99029 0.7494 0 1.408 2.3213 10.781 2.7849 11.244 0.30595 0.30595 0.97561-0.76582 1.5996-2.5601 0.80036-2.3013 2.2302-8.918 2.2302-10.32 0-1.2759 1.7874-4.1684 2.2747-3.6811 0.17059 0.17059-0.60566 7.5487-1.2314 11.704-0.65285 4.3355-1.4324 7.4922-2.3524 9.525-0.98531 2.1773-1.3255 2.4247-2.7071 1.9687-0.5987-0.19759-1.3093-0.54279-1.5791-0.76712-0.74474-0.61924-3.2512-5.3335-4.2413-7.9773-0.48352-1.2911-0.93865-2.3481-1.0114-2.349-0.0728-8.7e-4 -0.39769 1.1588-0.72207 2.5772-1.2736 5.5686-2.3413 9.19-2.7317 9.2652-0.21361 0.0411-0.95265-0.49808-1.6423-1.1983zm24.342 0-1.2539-1.2731 2.6e-4 -2.1076c5.3e-4 -3.4599 0.98025-11.2 2.0189-15.951 0.38213-1.7477 0.50708-1.977 1.2775-2.3444 0.75055-0.35792 1.1232-0.36363 3.0781-0.0472l2.2242 0.36003 2e-3 1.2548c2e-3 1.1525 0.0827 1.3097 0.99219 1.9278 0.54465 0.37011 0.99028 0.70734 0.99028 0.7494 0 1.408 2.3213 10.781 2.7849 11.244 0.30595 0.30595 0.97562-0.76582 1.5996-2.5601 0.80035-2.3013 2.2302-8.918 2.2302-10.32 0-1.2759 1.7874-4.1684 2.2747-3.6811 0.17059 0.17059-0.60566 7.5487-1.2314 11.704-0.65285 4.3355-1.4324 7.4922-2.3524 9.525-0.98531 2.1773-1.3255 2.4247-2.7071 1.9687-0.5987-0.19759-1.3093-0.54279-1.5791-0.76712-0.74473-0.61924-3.2512-5.3335-4.2413-7.9773-0.48352-1.2911-0.93865-2.3481-1.0114-2.349-0.0728-8.7e-4 -0.39769 1.1588-0.72207 2.5772-1.2736 5.5686-2.3413 9.19-2.7317 9.2652-0.21361 0.0411-0.95265-0.49808-1.6423-1.1983zm-121.89 2e-3c-0.50438-0.25443-1.1592-0.87933-1.4552-1.3886-0.68745-1.1829-0.697-3.8246-0.0273-7.5541l0.47752-2.6593-0.69262-1.3668c-0.38095-0.75187-0.69262-1.6648-0.69262-2.0288s0.51838-2.0051 1.152-3.6468c0.63358-1.6417 1.2252-3.1933 1.3146-3.448 0.11373-0.32377 0.44584-0.46303 1.1042-0.46303 0.78082 0 1.1436 0.21456 2.1248 1.2568 0.65077 0.69122 1.5045 1.7139 1.8972 2.2726l0.71403 1.0159-2.0275 8.2446c-1.1151 4.5345-2.1045 8.691-2.1985 9.2368-0.193 1.1201-0.39376 1.1829-1.6906 0.52875zm168.43-0.10529c-0.5515-0.78738-0.53676-1.0862 0.11678-2.3672 0.52109-1.0214 1.3553-1.5683 3.3604-2.203 0.52337-0.16566 0.5953-0.0961 0.5953 0.57512 0 0.41996-0.1832 1.3805-0.40712 2.1345-0.37858 1.2748-0.46549 1.3709-1.2397 1.3709-0.47822 0-1.0811 0.23345-1.4164 0.54848l-0.58383 0.54848zm12.539-0.0795c-0.50932-0.37843-1.3008-1.1314-1.7587-1.6732-0.79401-0.93938-0.81455-1.0203-0.44216-1.7404 0.35407-0.6847 0.3417-0.87004-0.1325-1.9848-0.66044-1.5526-1.8758-7.0159-2.0835-9.3655-0.11696-1.3234-0.25856-1.7859-0.54681-1.7859-0.31845 0-0.35507-0.27138-0.20198-1.4967 0.10285-0.82318 0.23935-1.6332 0.30336-1.7999 0.14894-0.3881 1.6782-1.2986 1.8659-1.1109 0.0781 0.0781 0.53094 1.7268 1.0064 3.6638 0.88156 3.5918 2.3307 8.0694 2.7461 8.4848 0.13074 0.13076 1.8651-2.7801 4.0111-6.7319 2.0794-3.8292 3.8028-6.9927 3.8298-7.0299s0.5527 0.52973 1.1683 1.2598l1.1193 1.3274-0.32697 1.4611c-0.25759 1.151-0.25898 1.8301-6e-3 3.2002 0.31065 1.6859 0.29719 1.7887-0.44066 3.3645-1.6532 3.5309-4.3968 7.4928-7.5064 10.84l-1.6778 1.8059zm12.861 0.0794c-0.55151-0.78738-0.53677-1.0862 0.11678-2.3672 0.52109-1.0214 1.3553-1.5683 3.3604-2.203 0.52337-0.16566 0.59531-0.0961 0.59531 0.57512 0 0.41996-0.1832 1.3805-0.40712 2.1345-0.37859 1.2748-0.46549 1.3709-1.2397 1.3709-0.47822 0-1.0811 0.23345-1.4164 0.54848l-0.58383 0Line truncated
|
||||||
|
After Width: | Height: | Size: 26 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg width="339.27mm" height="77.524mm" version="1.1" viewBox="0 0 339.27 77.524" xmlns="http://www.w3.org/2000/svg"><path d="m105.36 68.103c-0.14781-0.76398-0.33978-2.163-0.42659-3.1088-0.3432-3.7394-0.32964-3.7042-1.4265-3.7042-0.53872 0-1.6652-0.17859-2.5032-0.39687s-1.5774-0.39688-1.6431-0.39688-0.11938 0.71438-0.11938 1.5875c0 1.6861 0.17143 1.8922 0.90217 1.0847 0.25026-0.27653 0.69032-0.56432 0.97792-0.63953 0.43497-0.11374 0.49343-0.0403 0.34766 0.43665-0.24684 0.80762-1.9524 3.8428-2.2695 4.0388-0.1449 0.0895-0.77225-0.0315-1.3941-0.26897-1.1165-0.42638-1.1399-0.46196-1.8673-2.8331-0.40514-1.3207-0.79352-2.9548-0.86307-3.6313-0.0695-0.67648-0.26747-1.349-0.43982-1.4946-0.17236-0.14552-0.47566-0.66253-0.674-1.1489-0.30719-0.75329-0.30536-0.91932 0.0123-1.1204 0.20512-0.12985 0.51638-0.23792 0.69169-0.24015 0.17531-2e-3 0.37723-0.391 0.44873-0.86394 0.0715-0.47295 0.19431-1.2766 0.27294-1.7859 0.0786-0.50933 0.42754-1.8736 0.77537-3.0318l0.63242-2.1058 1.6527-0.87617c1.2445-0.65974 1.7392-0.80441 2.0027-0.58569 0.24301 0.20167 0.27899 0.47724 0.11771 0.90144-0.23393 0.61527-0.79478 5.8854-0.79646 7.484l-9e-4 0.85989 1.9182-4e-3c1.055-2e-3 2.0601-0.0942 2.2334-0.20447 0.17337-0.11023 0.7272-1.0907 1.2307-2.1788 1.4845-3.2078 3.0336-6.6859 3.3322-7.4812 0.31189-0.83099 1.487-1.4301 3.2898-1.6772l1.1457-0.15703 0.17439 1.0227c0.1308 0.76709-0.37185 3.5954-2.0109 11.315l-2.1853 10.293-0.88877 0.3725c-0.55676 0.23335-0.9985 0.66319-1.1825 1.1506-0.48427 1.283-1.1549 1.0038-1.4673-0.61092zm132.45-1.1925-1.2539-1.2731 2.6e-4 -2.1076c5.3e-4 -3.4599 0.98026-11.2 2.0189-15.951 0.38212-1.7477 0.50708-1.977 1.2775-2.3444 0.75055-0.35792 1.1232-0.36363 3.0781-0.0472l2.2242 0.36003 2e-3 1.2548c2e-3 1.1525 0.0827 1.3097 0.99218 1.9278 0.54466 0.37011 0.99029 0.70734 0.99029 0.7494 0 1.408 2.3213 10.781 2.7849 11.244 0.30595 0.30595 0.97561-0.76582 1.5996-2.5601 0.80036-2.3013 2.2302-8.918 2.2302-10.32 0-1.2759 1.7874-4.1684 2.2747-3.6811 0.17059 0.17059-0.60566 7.5487-1.2314 11.704-0.65285 4.3355-1.4324 7.4922-2.3524 9.525-0.98531 2.1773-1.3255 2.4247-2.7071 1.9687-0.5987-0.19759-1.3093-0.54279-1.5791-0.76712-0.74474-0.61924-3.2512-5.3335-4.2413-7.9773-0.48352-1.2911-0.93865-2.3481-1.0114-2.349-0.0728-8.7e-4 -0.39769 1.1588-0.72207 2.5772-1.2736 5.5686-2.3413 9.19-2.7317 9.2652-0.21361 0.0411-0.95265-0.49808-1.6423-1.1983zm24.342 0-1.2539-1.2731 2.6e-4 -2.1076c5.3e-4 -3.4599 0.98025-11.2 2.0189-15.951 0.38213-1.7477 0.50708-1.977 1.2775-2.3444 0.75055-0.35792 1.1232-0.36363 3.0781-0.0472l2.2242 0.36003 2e-3 1.2548c2e-3 1.1525 0.0827 1.3097 0.99219 1.9278 0.54465 0.37011 0.99028 0.70734 0.99028 0.7494 0 1.408 2.3213 10.781 2.7849 11.244 0.30595 0.30595 0.97562-0.76582 1.5996-2.5601 0.80035-2.3013 2.2302-8.918 2.2302-10.32 0-1.2759 1.7874-4.1684 2.2747-3.6811 0.17059 0.17059-0.60566 7.5487-1.2314 11.704-0.65285 4.3355-1.4324 7.4922-2.3524 9.525-0.98531 2.1773-1.3255 2.4247-2.7071 1.9687-0.5987-0.19759-1.3093-0.54279-1.5791-0.76712-0.74473-0.61924-3.2512-5.3335-4.2413-7.9773-0.48352-1.2911-0.93865-2.3481-1.0114-2.349-0.0728-8.7e-4 -0.39769 1.1588-0.72207 2.5772-1.2736 5.5686-2.3413 9.19-2.7317 9.2652-0.21361 0.0411-0.95265-0.49808-1.6423-1.1983zm-121.89 2e-3c-0.50438-0.25443-1.1592-0.87933-1.4552-1.3886-0.68745-1.1829-0.697-3.8246-0.0273-7.5541l0.47752-2.6593-0.69262-1.3668c-0.38095-0.75187-0.69262-1.6648-0.69262-2.0288s0.51838-2.0051 1.152-3.6468c0.63358-1.6417 1.2252-3.1933 1.3146-3.448 0.11373-0.32377 0.44584-0.46303 1.1042-0.46303 0.78082 0 1.1436 0.21456 2.1248 1.2568 0.65077 0.69122 1.5045 1.7139 1.8972 2.2726l0.71403 1.0159-2.0275 8.2446c-1.1151 4.5345-2.1045 8.691-2.1985 9.2368-0.193 1.1201-0.39376 1.1829-1.6906 0.52875zm168.43-0.10529c-0.5515-0.78738-0.53676-1.0862 0.11678-2.3672 0.52109-1.0214 1.3553-1.5683 3.3604-2.203 0.52337-0.16566 0.5953-0.0961 0.5953 0.57512 0 0.41996-0.1832 1.3805-0.40712 2.1345-0.37858 1.2748-0.46549 1.3709-1.2397 1.3709-0.47822 0-1.0811 0.23345-1.4164 0.54848l-0.58383 0.54848zm12.539-0.0795c-0.50932-0.37843-1.3008-1.1314-1.7587-1.6732-0.79401-0.93938-0.81455-1.0203-0.44216-1.7404 0.35407-0.6847 0.3417-0.87004-0.1325-1.9848-0.66044-1.5526-1.8758-7.0159-2.0835-9.3655-0.11696-1.3234-0.25856-1.7859-0.54681-1.7859-0.31845 0-0.35507-0.27138-0.20198-1.4967 0.10285-0.82318 0.23935-1.6332 0.30336-1.7999 0.14894-0.3881 1.6782-1.2986 1.8659-1.1109 0.0781 0.0781 0.53094 1.7268 1.0064 3.6638 0.88156 3.5918 2.3307 8.0694 2.7461 8.4848 0.13074 0.13076 1.8651-2.7801 4.0111-6.7319 2.0794-3.8292 3.8028-6.9927 3.8298-7.0299s0.5527 0.52973 1.1683 1.2598l1.1193 1.3274-0.32697 1.4611c-0.25759 1.151-0.25898 1.8301-6e-3 3.2002 0.31065 1.6859 0.29719 1.7887-0.44066 3.3645-1.6532 3.5309-4.3968 7.4928-7.5064 10.84l-1.6778 1.8059zm12.861 0.0794c-0.55151-0.78738-0.53677-1.0862 0.11678-2.3672 0.52109-1.0214 1.3553-1.5683 3.3604-2.203 0.52337-0.16566 0.59531-0.0961 0.59531 0.57512 0 0.41996-0.1832 1.3805-0.40712 2.1345-0.37859 1.2748-0.46549 1.3709-1.2397 1.3709-0.47822 0-1.0811 0.23345-1.4164 0.54848l-0.58383 0Line truncated
|
||||||
|
After Width: | Height: | Size: 26 KiB |
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
"name": "Goju-Kai Dojo – Karate-Wiki",
|
||||||
|
"short_name": "Karate-Wiki",
|
||||||
|
"description": "Internes Vereins-Wiki & Technik-Videothek des Goju-Kai Dojo Heilbronn e.V.",
|
||||||
|
"start_url": "/index.php?title=Hauptseite",
|
||||||
|
"scope": "/",
|
||||||
|
"display": "standalone",
|
||||||
|
"orientation": "any",
|
||||||
|
"background_color": "#121314",
|
||||||
|
"theme_color": "#1a1a1a",
|
||||||
|
"lang": "de",
|
||||||
|
"icons": [
|
||||||
|
{
|
||||||
|
"src": "/resources/assets/icon.svg",
|
||||||
|
"sizes": "any",
|
||||||
|
"type": "image/svg+xml",
|
||||||
|
"purpose": "any maskable"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"src": "/resources/assets/favicon-32x32.png",
|
||||||
|
"sizes": "32x32",
|
||||||
|
"type": "image/png"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
// Karate-Wiki Service Worker (PWA Offline-Cache & App Lifecycle)
|
||||||
|
const CACHE_NAME = 'karatewiki-cache-v1';
|
||||||
|
const PRECACHE_ASSETS = [
|
||||||
|
'/resources/assets/icon.svg',
|
||||||
|
'/resources/assets/favicon-32x32.png',
|
||||||
|
'/resources/assets/logo.svg',
|
||||||
|
'/resources/assets/logo-light.svg',
|
||||||
|
'/manifest.webmanifest'
|
||||||
|
];
|
||||||
|
|
||||||
|
self.addEventListener('install', (event) => {
|
||||||
|
self.skipWaiting();
|
||||||
|
event.waitUntil(
|
||||||
|
caches.open(CACHE_NAME).then((cache) => {
|
||||||
|
return cache.addAll(PRECACHE_ASSETS).catch(() => {});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
self.addEventListener('activate', (event) => {
|
||||||
|
event.waitUntil(
|
||||||
|
Promise.all([
|
||||||
|
self.clients.claim(),
|
||||||
|
caches.keys().then((keys) => {
|
||||||
|
return Promise.all(
|
||||||
|
keys.map((key) => {
|
||||||
|
if (key !== CACHE_NAME) {
|
||||||
|
return caches.delete(key);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
})
|
||||||
|
])
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Network-first Strategie fuer dynamische Wiki-Inhalte
|
||||||
|
self.addEventListener('fetch', (event) => {
|
||||||
|
const request = event.request;
|
||||||
|
if (request.method !== 'GET') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fuer statische Assets (Icons, SVGs) Cache mit Fallback
|
||||||
|
const url = new URL(request.url);
|
||||||
|
if (url.pathname.startsWith('/resources/assets/') || url.pathname.endsWith('.webmanifest')) {
|
||||||
|
event.respondWith(
|
||||||
|
caches.match(request).then((cached) => {
|
||||||
|
return (
|
||||||
|
cached ||
|
||||||
|
fetch(request).then((response) => {
|
||||||
|
if (response && response.status === 200) {
|
||||||
|
const clone = response.clone();
|
||||||
|
caches.open(CACHE_NAME).then((cache) => cache.put(request, clone));
|
||||||
|
}
|
||||||
|
return response;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fuer alle Wiki-Seiten: Direkt ueber Netzwerk
|
||||||
|
event.respondWith(
|
||||||
|
fetch(request).catch(() => {
|
||||||
|
return caches.match(request);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -35,16 +35,38 @@ $wgLanguageCode = 'de';
|
|||||||
|
|
||||||
$wgScriptPath = '';
|
$wgScriptPath = '';
|
||||||
$wgScriptExtension = '.php';
|
$wgScriptExtension = '.php';
|
||||||
$wgServer = getenv( 'MW_SERVER' ) ?: ( $wgServer ?? 'https://www.gojukai-dojo.de' );
|
if ( getenv( 'MW_SERVER' ) ) {
|
||||||
|
$wgServer = getenv( 'MW_SERVER' );
|
||||||
|
} elseif ( empty( $wgServer ) ) {
|
||||||
|
if ( !empty( $_SERVER['HTTP_HOST'] ) ) {
|
||||||
|
$isHttps = ( !empty( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] !== 'off' )
|
||||||
|
|| ( ( $_SERVER['HTTP_X_FORWARDED_PROTO'] ?? '' ) === 'https' );
|
||||||
|
$wgServer = ( $isHttps ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
|
||||||
|
} else {
|
||||||
|
$wgServer = 'https://www.gojukai-dojo.de';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$wgStylePath = "$wgScriptPath/skins";
|
$wgStylePath = "$wgScriptPath/skins";
|
||||||
$wgResourceBasePath = $wgScriptPath;
|
$wgResourceBasePath = $wgScriptPath;
|
||||||
$wgLogo = "$wgResourceBasePath/resources/assets/logo_goju-kai_Bleistift.png";
|
$wgLogo = "$wgResourceBasePath/resources/assets/logo.svg";
|
||||||
|
$wgFavicon = "$wgResourceBasePath/resources/assets/favicon-32x32.png";
|
||||||
$wgLogos = [
|
$wgLogos = [
|
||||||
'1x' => $wgLogo,
|
'1x' => $wgLogo,
|
||||||
|
'svg' => $wgLogo,
|
||||||
'icon' => $wgLogo,
|
'icon' => $wgLogo,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// 2b. Individuelle Vereins-Anmeldeseite (Spezial:Anmelden)
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
$wgKarateLoginTitle = 'Goju-Kai Dojo Heilbronn e.V.';
|
||||||
|
$wgKarateLoginSubtitle = 'Internes Vereins-Wiki & Technik-Videothek';
|
||||||
|
$wgKarateLoginNotice = 'Willkommen im Trainings- und Nachschlagewerk unseres Karate-Vereins! '
|
||||||
|
. 'Hier findest du alle Kata-, Bunkai- und Kihon-Lehrvideos, Prüfungsordnungen sowie unser Dojo-Wissen. '
|
||||||
|
. 'Der Zugriff ist geschützt und ausschließlich für aktive Vereinsmitglieder freigeschaltet.';
|
||||||
|
$wgKarateAccessRequestUrl = 'https://shop.karate.hn/produkt/zugang-zu-vereinseigenem-karatewiki-20';
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// 3. E-Mail-Konfiguration
|
// 3. E-Mail-Konfiguration
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -71,15 +93,30 @@ $wgSecretKey = getenv( 'MW_SECRET_KEY' ) ?: ( $wgSecretKey ?? '' );
|
|||||||
$wgUpgradeKey = getenv( 'MW_UPGRADE_KEY' ) ?: ( $wgUpgradeKey ?? '' );
|
$wgUpgradeKey = getenv( 'MW_UPGRADE_KEY' ) ?: ( $wgUpgradeKey ?? '' );
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// 5. Cache & Uploads / Mediendateien
|
// 5. Performance-Cache & Uploads / Mediendateien
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
$wgMainCacheType = CACHE_NONE;
|
// Wichtig fuer Strato Shared-Webspace (NFS-Dateisystem):
|
||||||
|
// Kein CDB-/Datei-Locking ($wgCacheDirectory) auf Strato-NFS verwenden, da dies
|
||||||
|
// auf verteilten Strato-Webservern zu sporadischen Haengern/500-Fehlern fuehrt!
|
||||||
|
$wgMainCacheType = CACHE_DB;
|
||||||
$wgMemCachedServers = [];
|
$wgMemCachedServers = [];
|
||||||
|
if ( getenv( 'MW_ENV' ) ) {
|
||||||
|
$wgCacheDirectory = "$IP/cache";
|
||||||
|
$wgUseLocalMessageCache = true;
|
||||||
|
} else {
|
||||||
|
$wgCacheDirectory = false;
|
||||||
|
$wgUseLocalMessageCache = false;
|
||||||
|
}
|
||||||
|
$wgParserCacheType = CACHE_DB;
|
||||||
|
$wgEnableSidebarCache = true;
|
||||||
|
// Verhindert Loopback-HTTP-Timeouts bei Seitenaufrufen auf Strato Shared-Hosting
|
||||||
|
$wgRunJobsAsync = false;
|
||||||
|
$wgJobRunRate = 0;
|
||||||
|
|
||||||
$wgEnableUploads = true;
|
$wgEnableUploads = true;
|
||||||
$wgUseImageMagick = true;
|
$wgUseImageMagick = true;
|
||||||
$wgImageMagickConvertCommand = '/usr/bin/convert';
|
$wgImageMagickConvertCommand = '/usr/bin/convert';
|
||||||
$wgUseInstantCommons = true;
|
$wgUseInstantCommons = false;
|
||||||
$wgShellLocale = 'en_US.utf8';
|
$wgShellLocale = 'en_US.utf8';
|
||||||
|
|
||||||
$wgFileExtensions = [
|
$wgFileExtensions = [
|
||||||
@@ -174,11 +211,12 @@ foreach ( $karateOptionalExtensions as $extName ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WikiEditor Standard-Optionen
|
// WikiEditor Standard-Optionen & Responsive Skin
|
||||||
$wgDefaultUserOptions['usebetatoolbar'] = 1;
|
$wgDefaultUserOptions['usebetatoolbar'] = 1;
|
||||||
$wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
|
$wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
|
||||||
$wgDefaultUserOptions['wikieditor-preview'] = 1;
|
$wgDefaultUserOptions['wikieditor-preview'] = 1;
|
||||||
$wgDefaultUserOptions['wikieditor-publish'] = 1;
|
$wgDefaultUserOptions['wikieditor-publish'] = 1;
|
||||||
|
$wgDefaultUserOptions['skin-responsive'] = 1;
|
||||||
|
|
||||||
// CookieWarning & EditUser Berechtigungen
|
// CookieWarning & EditUser Berechtigungen
|
||||||
$wgCookieWarningEnabled = true;
|
$wgCookieWarningEnabled = true;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
; PHP-Konfiguration fuer grosse Karate-Videos (MP4)
|
; PHP-Konfiguration fuer grosse Karate-Videos (MP4) & Mehrfach-Uploads
|
||||||
upload_max_filesize = 500M
|
upload_max_filesize = 500M
|
||||||
post_max_size = 500M
|
post_max_size = 512M
|
||||||
|
max_file_uploads = 50
|
||||||
memory_limit = 512M
|
memory_limit = 512M
|
||||||
max_execution_time = 600
|
max_execution_time = 600
|
||||||
max_input_time = 600
|
max_input_time = 600
|
||||||
@@ -26,7 +26,7 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
MW_VERSION: "1.43"
|
MW_VERSION: "1.46"
|
||||||
environment:
|
environment:
|
||||||
MW_ENV: "development"
|
MW_ENV: "development"
|
||||||
MW_SERVER: "${MW_SERVER:-http://192.168.2.49:3093}"
|
MW_SERVER: "${MW_SERVER:-http://192.168.2.49:3093}"
|
||||||
@@ -41,7 +41,13 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./config/LocalSettings.php:/var/www/html/LocalSettings.php:ro
|
- ./config/LocalSettings.php:/var/www/html/LocalSettings.php:ro
|
||||||
- ./config/php-uploads.ini:/usr/local/etc/php/conf.d/zz-karate-uploads.ini:ro
|
- ./config/php-uploads.ini:/usr/local/etc/php/conf.d/zz-karate-uploads.ini:ro
|
||||||
|
- ./assets/logo.svg:/var/www/html/resources/assets/logo.svg:ro
|
||||||
|
- ./assets/logo-light.svg:/var/www/html/resources/assets/logo-light.svg:ro
|
||||||
|
- ./assets/icon.svg:/var/www/html/resources/assets/icon.svg:ro
|
||||||
|
- ./assets/favicon-32x32.png:/var/www/html/resources/assets/favicon-32x32.png:ro
|
||||||
- ./assets/logo_goju-kai_Bleistift.png:/var/www/html/resources/assets/logo_goju-kai_Bleistift.png:ro
|
- ./assets/logo_goju-kai_Bleistift.png:/var/www/html/resources/assets/logo_goju-kai_Bleistift.png:ro
|
||||||
|
- ./assets/manifest.webmanifest:/var/www/html/manifest.webmanifest:ro
|
||||||
|
- ./assets/sw.js:/var/www/html/sw.js:ro
|
||||||
- ./extensions-custom/KarateMedia:/var/www/html/extensions/KarateMedia:ro
|
- ./extensions-custom/KarateMedia:/var/www/html/extensions/KarateMedia:ro
|
||||||
- dev-karatewiki-images:/var/www/html/images
|
- dev-karatewiki-images:/var/www/html/images
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
+13
-4
@@ -1,5 +1,7 @@
|
|||||||
# Server production / standby stack: /home/lars/docker/karatewiki
|
# Server production / standby stack: /home/lars/docker/karatewiki
|
||||||
# No fixed container_name — Compose prefixes with the project name.
|
# No fixed container_name — Compose prefixes with the project name.
|
||||||
|
# Teilt sich das 4.79 GB Medien-Volume (karatewiki-dev_dev-karatewiki-images) mit Dev,
|
||||||
|
# damit Videos und Bilder auf dem Raspberry Pi NICHT doppelt gespeichert werden!
|
||||||
|
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
@@ -26,7 +28,7 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
MW_VERSION: "1.43"
|
MW_VERSION: "1.46"
|
||||||
environment:
|
environment:
|
||||||
MW_ENV: "production"
|
MW_ENV: "production"
|
||||||
MW_SERVER: "${MW_SERVER:-http://192.168.2.49:3008}"
|
MW_SERVER: "${MW_SERVER:-http://192.168.2.49:3008}"
|
||||||
@@ -40,11 +42,16 @@ services:
|
|||||||
MW_UPGRADE_KEY: "${MW_UPGRADE_KEY}"
|
MW_UPGRADE_KEY: "${MW_UPGRADE_KEY}"
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/LocalSettings.php:/var/www/html/LocalSettings.php:ro
|
- ./config/LocalSettings.php:/var/www/html/LocalSettings.php:ro
|
||||||
- ./config/php-uploads.ini:/var/www/html/config-php-uploads.ini:ro
|
|
||||||
- ./config/php-uploads.ini:/usr/local/etc/php/conf.d/zz-karate-uploads.ini:ro
|
- ./config/php-uploads.ini:/usr/local/etc/php/conf.d/zz-karate-uploads.ini:ro
|
||||||
|
- ./assets/logo.svg:/var/www/html/resources/assets/logo.svg:ro
|
||||||
|
- ./assets/logo-light.svg:/var/www/html/resources/assets/logo-light.svg:ro
|
||||||
|
- ./assets/icon.svg:/var/www/html/resources/assets/icon.svg:ro
|
||||||
|
- ./assets/favicon-32x32.png:/var/www/html/resources/assets/favicon-32x32.png:ro
|
||||||
- ./assets/logo_goju-kai_Bleistift.png:/var/www/html/resources/assets/logo_goju-kai_Bleistift.png:ro
|
- ./assets/logo_goju-kai_Bleistift.png:/var/www/html/resources/assets/logo_goju-kai_Bleistift.png:ro
|
||||||
|
- ./assets/manifest.webmanifest:/var/www/html/manifest.webmanifest:ro
|
||||||
|
- ./assets/sw.js:/var/www/html/sw.js:ro
|
||||||
- ./extensions-custom/KarateMedia:/var/www/html/extensions/KarateMedia:ro
|
- ./extensions-custom/KarateMedia:/var/www/html/extensions/KarateMedia:ro
|
||||||
- karatewiki-images:/var/www/html/images
|
- karatewiki-shared-images:/var/www/html/images
|
||||||
ports:
|
ports:
|
||||||
- "${MW_PORT:-3008}:80"
|
- "${MW_PORT:-3008}:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -62,7 +69,9 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
karatewiki-db-data:
|
karatewiki-db-data:
|
||||||
karatewiki-images:
|
karatewiki-shared-images:
|
||||||
|
external: true
|
||||||
|
name: karatewiki-dev_dev-karatewiki-images
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
karatewiki-network:
|
karatewiki-network:
|
||||||
|
|||||||
@@ -95,12 +95,13 @@ In der bisherigen `LocalSettings.php` auf Strato waren **zwei** veraltete Video-
|
|||||||
## 3. Architektur- & Design-Entscheidungen
|
## 3. Architektur- & Design-Entscheidungen
|
||||||
|
|
||||||
### Entscheidung 1: Kein MediaWiki-Core im Git-Repository
|
### Entscheidung 1: Kein MediaWiki-Core im Git-Repository
|
||||||
Da am MediaWiki-Core niemals manuell herumgepatcht wurde, wird der MediaWiki-Core **nicht** in Gitea eingecheckt. Stattdessen kommt der Core im Docker-Betrieb direkt aus dem offiziellen Multi-Arch-Image `mediawiki:1.43` (LTS). Das hält das Git-Repository winzig (< 100 KB) und erlaubt zukünftige MediaWiki- oder PHP-Versionssprünge durch Ändern einer einzigen Versionsnummer im [`Dockerfile`](../Dockerfile).
|
Da am MediaWiki-Core niemals manuell herumgepatcht wurde, wird der MediaWiki-Core **nicht** in Gitea eingecheckt. Stattdessen kommt der Core im Docker-Betrieb direkt aus dem offiziellen Multi-Arch-Image `mediawiki:1.46` (`1.46.2`). Das hält das Git-Repository winzig (< 100 KB) und erlaubt zukünftige MediaWiki- oder PHP-Versionssprünge durch Ändern einer einzigen Versionsnummer im [`Dockerfile`](../Dockerfile).
|
||||||
|
|
||||||
### Entscheidung 2: Eigene Kombi-Extension `KarateMedia` statt Drittanbieter-Video-Plugins
|
### Entscheidung 2: Eigene Kombi-Extension `KarateMedia` & Vereins-Anmeldeseite
|
||||||
Anstatt erneut fremde Video-Plugins zu installieren, haben wir unter [`extensions-custom/KarateMedia/`](../extensions-custom/KarateMedia/) eine eigene, exakt auf das Karate-Wiki zugeschnittene MediaWiki-Extension entwickelt:
|
Anstatt erneut fremde Video-Plugins zu installieren, haben wir unter [`extensions-custom/KarateMedia/`](../extensions-custom/KarateMedia/) eine eigene, exakt auf das Karate-Wiki zugeschnittene MediaWiki-Extension entwickelt:
|
||||||
* **100 % Abwärtskompatibel:** Sie implementiert sowohl den Parser-Hook `<html5media>` ([`KarateMediaHooks.php`](../extensions-custom/KarateMedia/src/KarateMediaHooks.php)) für die 87 alten Seiten als auch den `MediaHandler` ([`KarateVideoHandler.php`](../extensions-custom/KarateMedia/src/KarateVideoHandler.php)) für die ~71 Seiten mit `[[Datei:*.mp4|mini|...]]`. Es muss **keine einzige Wiki-Seite** umgeschrieben werden!
|
* **100 % Abwärtskompatibel:** Sie implementiert sowohl den Parser-Hook `<html5media>` ([`KarateMediaHooks.php`](../extensions-custom/KarateMedia/src/KarateMediaHooks.php)) für die 87 alten Seiten als auch den `MediaHandler` ([`KarateVideoHandler.php`](../extensions-custom/KarateMedia/src/KarateVideoHandler.php)) für die ~71 Seiten mit `[[Datei:*.mp4|mini|...]]`. Es muss **keine einzige Wiki-Seite** umgeschrieben werden!
|
||||||
* **Mehrwert fürs Karate-Training:** Unter jedem Video rendert `KarateMedia` automatisch kompakte Steuerbuttons für **`1x` | `0.5x` | `0.25x` | `Loop`** ([`karatemedia.js`](../extensions-custom/KarateMedia/resources/karatemedia.js)), damit Kata- und Bunkai-Techniken direkt in Zeitlupe und Endlosschleife studiert werden können.
|
* **Mehrwert fürs Karate-Training:** Unter jedem Video rendert `KarateMedia` automatisch kompakte Steuerbuttons für **`1x` | `0.5x` | `0.25x` | `Loop`** ([`karatemedia.js`](../extensions-custom/KarateMedia/resources/karatemedia.js)), damit Kata- und Bunkai-Techniken direkt in Zeitlupe und Endlosschleife studiert werden können.
|
||||||
|
* **Moderne Vereins-Anmeldeseite & Direkter Login-Redirect:** Unangemeldete Besucher werden ohne Zwischenseite (`Special:Badtitle` / „Anmeldung erforderlich“) sofort per `302`-Redirect auf `Spezial:Anmelden` geleitet. Dort erscheint eine maßgeschneiderte Anmelde-Card im Design von Goju-Kai Dojo Heilbronn e.V. mit dem offiziellen Vektor-Vereinslogo ([`assets/logo-light.svg`](../assets/logo-light.svg) auf dunklem Header, [`assets/logo.svg`](../assets/logo.svg) in der hellen Wiki-Seitenleiste) und dem direkten Link zum Beantragen von Zugangsdaten im Vereinsshop (`https://shop.karate.hn/produkt/zugang-zu-vereinseigenem-karatewiki-20`).
|
||||||
|
|
||||||
### Entscheidung 3: Fehlertolerante `LocalSettings.php` für Docker UND Strato
|
### Entscheidung 3: Fehlertolerante `LocalSettings.php` für Docker UND Strato
|
||||||
Die neue [`config/LocalSettings.php`](../config/LocalSettings.php) ist so aufgebaut, dass sie:
|
Die neue [`config/LocalSettings.php`](../config/LocalSettings.php) ist so aufgebaut, dass sie:
|
||||||
@@ -148,20 +149,37 @@ Details zum Deployment stehen in [`docs/DEPLOYMENT.md`](DEPLOYMENT.md). Kurzfass
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 6. Aktueller Arbeitsstand & Nächste Schritte (Roadmap)
|
## 6. Neue Strato-Parallelinstallation (`~/Karatewiki` & `~/karatewiki-shared`)
|
||||||
|
|
||||||
|
Um auf Strato ohne Ausfallzeit des bestehenden Systems (`~/Karate_Wiki_135`) auf die neueste MediaWiki-Version (`1.46.2`), PHP `8.4` und MariaDB `11.8` umzustellen und gleichzeitig den über Jahre angesammelten Dateimüll (3,5 GB Temp-/Archiv-/Waisen-Dateien) zu beseitigen, wurde folgende saubere Struktur auf Strato aufgebaut:
|
||||||
|
|
||||||
|
* **Neues Anwendungsverzeichnis (versionsunabhängig):** `~/Karatewiki` (MediaWiki `1.46.2`, PHP `8.4` via `.htaccess`, `MsUpload` für Drag-&-Drop-Mehrfach-Uploads bis `500M`, `KarateMedia` sowie Datei- und Beschleuniger-Caching).
|
||||||
|
* **Zentrales, bereinigtes Medien- & Secrets-Verzeichnis:** `~/karatewiki-shared/`
|
||||||
|
* `~/karatewiki-shared/images` (per Symlink in `~/Karatewiki/images` eingebunden): Enthält **ausschließlich die 566 tatsächlich im Wiki verlinkten Mediendateien (4,79 GB)** per Hardlink (0 Byte zusätzlicher Speicherplatzverbrauch, 0 Byte Altlasten).
|
||||||
|
* `~/karatewiki-shared/LocalSettings.secrets.php` (`chmod 600`, per Symlink in `~/Karatewiki/LocalSettings.secrets.php` eingebunden).
|
||||||
|
* **Neue MariaDB 11.8 Datenbank auf Strato:**
|
||||||
|
* **Host:** `database-5021739551.webspace-host.com`
|
||||||
|
* **Datenbank:** `dbs16266664`
|
||||||
|
* **Benutzer:** `dbu3366014`
|
||||||
|
* **Tabellen-Präfix:** `Karate_`
|
||||||
|
* **Altsystem (`~/Karate_Wiki_135` + alte MySQL 5.7 DB `dbs1754262`):** Bleibt während der gesamten Testphase auf einer Testdomain zu 100 % unverändert als sofortiges Fallback bestehen, bis die Hauptdomain `www.gojukai-dojo.de` im Strato-Kundenmenü auf `/Karatewiki` umgestellt wird.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. Aktueller Arbeitsstand & Nächste Schritte (Roadmap)
|
||||||
|
|
||||||
### ✅ Bereits erledigt:
|
### ✅ Bereits erledigt:
|
||||||
- [x] Rein lesende Bestandsaufnahme des Strato-Produktivsystems (`Karate_Wiki_135`) und der MySQL-Datenbank (`dbs1754262`).
|
- [x] Rein lesende Bestandsaufnahme des Strato-Produktivsystems (`Karate_Wiki_135`) und der MySQL-Datenbank (`dbs1754262`).
|
||||||
- [x] Auswertung aller 1.028 Wiki-Seiten und Identifikation aller Video-Einbindungen (87× `<html5media>`, ~71× `[[Datei:*.mp4]]`).
|
- [x] Auswertung aller 1.028 Wiki-Seiten und Identifikation aller Video-Einbindungen (87× `<html5media>`, ~71× `[[Datei:*.mp4]]`).
|
||||||
- [x] Entwicklung der eigenen Extension **`KarateMedia`** (`extensions-custom/KarateMedia/`) als Ersatz für `Html5mediator` und `EmbedVideo`.
|
- [x] Auswertung des Medienbestands: Von 8,3 GB `images/` auf Strato sind **566 Dateien (4,79 GB)** tatsächlich auf Seiten eingebunden (Rest: 1,8 GB `temp/`, 514 MB `archive/`, 648 MB verwaiste Uploads).
|
||||||
- [x] Bereinigung und Modernisierung der `LocalSettings.php` (`config/LocalSettings.php`).
|
- [x] Entwicklung der eigenen Extension **`KarateMedia`** (`extensions-custom/KarateMedia/`) als Ersatz für `Html5mediator` und `EmbedVideo` (inkl. Zeitlupe `0.5x`/`0.25x` und `Loop`).
|
||||||
- [x] Aufbau der Docker-Konfiguration für MediaWiki 1.43 LTS + MariaDB 11.8 (`Dockerfile`, `docker-compose.yml`, `docker-compose.dev-env.yml`).
|
- [x] Gestaltung der modernen **Goju-Kai Dojo Heilbronn e.V. Vereins-Anmeldeseite** (`Spezial:Anmelden`) inkl. Direkt-Redirect für geschützte Seiten, offiziellem Vektor-Logo (`logo.svg` / `logo-light.svg`) von `karate.hn` und Shop-Link.
|
||||||
- [x] Einrichtung der Gitea-Runner-Workflows (`deploy-dev.yml`, `deploy-prod.yml`) inkl. automatischer Datenbank-Initialisierung (`scripts/ensure-db-schema.php`).
|
- [x] Bereinigung und Modernisierung der `LocalSettings.php` (`config/LocalSettings.php`) inkl. `MsUpload`-Integration (Multi-File Drag & Drop bis 500 MB) und Performance-Caching.
|
||||||
- [x] Push von `main` und `develop` nach `https://gitea.stommer.de/Lars/karatewiki.git`.
|
- [x] Aufbau der Docker-Konfiguration und Upgrade auf **MediaWiki 1.46.2** + MariaDB 11.8 (`Dockerfile`, `docker-compose.yml`, `docker-compose.dev-env.yml`).
|
||||||
|
- [x] Gemeinsames Medien-Volume (`karatewiki-dev_dev-karatewiki-images`) auf dem Raspberry Pi 5 (`http://192.168.2.49:3093`) eingerichtet und erfolgreich getestet.
|
||||||
|
- [x] Aufbau der neuen Strato-Parallelinstallation unter `~/Karatewiki` mit zentralem Medienordner `~/karatewiki-shared/images` (4,79 GB bereinigt) und neuer MariaDB 11.8 (`dbs16266664` auf `database-5021739551.webspace-host.com`).
|
||||||
|
|
||||||
### 🔜 Offene Punkte / Nächste Schritte:
|
### 🔜 Nächste Schritte:
|
||||||
- [ ] **1. Gitea-Runner-Lauf prüfen:** Kontrollieren, ob `deploy-dev.yml` auf dem Raspberry Pi 5 (`http://192.168.2.49:3093`) erfolgreich durchläuft (ggf. Runner-Konfiguration mit aktuellem Repo abgleichen).
|
- [ ] **1. Testdomain bei Strato auf `/Karatewiki` zeigen lassen:** Im Strato-Kundenmenü eine Testdomain/Subdomain auf das Verzeichnis `/Karatewiki` richten und Login, Videos und `MsUpload` live auf Strato prüfen.
|
||||||
- [ ] **2. Live-Datenbank & Beispiel-Videos in `karatewiki-dev` einspielen:** Mit [`scripts/sync-from-strato.sh`](../scripts/sync-from-strato.sh) einen aktuellen DB-Abzug und ausgewählte (oder alle) Videos von Strato nach `/home/lars/docker/karatewiki-dev` holen und das Upgrade-Skript (`php maintenance/run.php update --quick`) gegen die echten Vereinsdaten testen.
|
- [ ] **2. Domain-Umschaltung (`www.gojukai-dojo.de`):** Nach erfolgreichem Test die Hauptdomain `www.gojukai-dojo.de` im Strato-Kundenmenü von `/Karate_Wiki_135` auf `/Karatewiki` umstellen.
|
||||||
- [ ] **3. Drittanbieter-Extensions im `Dockerfile` ergänzen (nach Bedarf):** Prüfen, welche der optionalen Extensions (`MsUpload`, `UploadWizard`, `MobileFrontend`, `LinkTitles`, `EditUser`) in MediaWiki 1.43 weiterhin gewünscht sind, und diese im `Dockerfile` automatisch in das Image einbauen.
|
- [ ] **3. Altlasten-Bereinigung nach Bewährungsphase:** Sobald `/Karatewiki` im Live-Betrieb stabil läuft, kann das alte Verzeichnis `~/Karate_Wiki_135` (inkl. 3,5 GB Dateimüll) und die alte MySQL 5.7 Datenbank `dbs1754262` gelöscht werden (die 566 Hardlinks in `~/karatewiki-shared/images` bleiben dabei vollständig erhalten!).
|
||||||
- [ ] **4. Gewünschte Vereins-Modifikationen umsetzen:** Neue Features und Anpassungen auf dem `develop`-Branch entwickeln und unter `http://192.168.2.49:3093` testen.
|
|
||||||
- [ ] **5. Strato-Deployment / Cutover planen:** Entscheiden, ob Strato beim Merge auf `main` ebenfalls automatisiert aktualisiert wird oder ob das Wiki langfristig über den Reverse-Proxy komplett auf der eigenen Infrastruktur läuft.
|
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# Karatewiki (Goju-Kai Dojo) – Feature-Backlog & Roadmap
|
||||||
|
|
||||||
|
Dieses Dokument sammelt alle geplanten und diskutierten Funktionserweiterungen, Optimierungen und Ideen für das Karate-Wiki des Goju-Kai Dojo Heilbronn e.V.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎯 Priorität 1: Mobile-Optimierung & PWA (Fertiggestellt & auf Dev verifiziert)
|
||||||
|
|
||||||
|
- [x] **Echtes Mobile Viewport (Kein 1120px Desktop-Zoom mehr):**
|
||||||
|
- **Problem:** Vector (Legacy) setzte standardmäßig `<meta name="viewport" content="width=1120">`, weshalb Smartphones die Seite auf 1120px Breite herauszoomten (Schrift & Buttons briefmarkengroß).
|
||||||
|
- **Lösung:** Skin-Reflection (`$skin->options['responsive'] = true`), Purgen alter Viewport-Tags und Setzen von `width=device-width, initial-scale=1.0, maximum-scale=5.0`.
|
||||||
|
- **Schriftgrößen & Touch-Ziele:** Mindestschriftgröße 16px auf Mobilgeräten (verhindert auch iOS-Autozoom bei Formularfeldern), mobile Navigationsleiste, flüssige Content-Breite.
|
||||||
|
- **Flüssige Tabellen & Kacheln:** Gürtelkarten (2-spaltig) und Themenkacheln (1-spaltig) passen sich flexibel der Handybreite an. Tabellen mit flüssigem Touch-Scroll.
|
||||||
|
- **Mobiles Menü:** Schwebender `☰ Dojo-Menü`-Button öffnet die Vereins-Seitenleiste als Drawer mit abgedunkeltem Blur-Hintergrund.
|
||||||
|
- [x] **PWA (Progressive Web App):**
|
||||||
|
- `manifest.webmanifest` mit App-Namen ("Goju-Kai Dojo – Karate-Wiki"), Start-URL, App-Icons (SVG & 32x32 PNG maskable) und `theme_color` (`#1a1a1a`), `background_color` (`#121314`).
|
||||||
|
- `display: standalone` (beim Öffnen vom Smartphone-Homescreen entfällt die Browser-URL-Leiste, wirkt wie eine native App).
|
||||||
|
- Apple-Touch-Icons & Safari PWA-Meta-Tags (`apple-mobile-web-app-capable`, `apple-mobile-web-app-status-bar-style: black-translucent`, `apple-mobile-web-app-title`).
|
||||||
|
- Schneller Service-Worker (`/sw.js`) zum Cachen von App-Shell (CSS, JS, Logos, Favicon) für blitzschnellen Start auch bei schwachem Hallen-WLAN.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🥋 Priorität 2: Video- & Technik-Features (Dojo-Videothek)
|
||||||
|
|
||||||
|
- [ ] **Spiegelmodus (`🪞 Spiegeln`):**
|
||||||
|
- Button an jedem Video-Player, der das Video horizontal spiegelt (`transform: scaleX(-1)`).
|
||||||
|
- Ermöglicht es Karateka, das Tablet/Handy vor sich aufzustellen und Katas synchron "wie im Spiegel" mitzulaufen, ohne links und rechts im Kopf umdenken zu müssen.
|
||||||
|
- [ ] **Einzelbild-Schaltung (Frame-by-Frame):**
|
||||||
|
- Buttons `< Frame` und `Frame >` (+ Shortcut Tasten `,` und `.`), um Techniken im Bruchteil einer Sekunde anzuhalten und Schritt für Schritt zu analysieren (Treffmoment, Faustdrehung, Hüftstellung).
|
||||||
|
- [ ] **Video-Kapitel & Sprungmarken:**
|
||||||
|
- Klickbare Zeitstempel im Text (z.B. `[0:45] Osae-Uke`, `[1:20] Wendung`), die das Video direkt an die entsprechende Sekunde springen lassen.
|
||||||
|
- [ ] **Side-by-Side Videovergleich:**
|
||||||
|
- Zwei Videos nebeneinander abspielen (z.B. Kata von vorne vs. von der Seite, oder Schüler vs. Sensei) mit synchronisiertem Play/Pause.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📋 Priorität 3: Prüfungsvorbereitung & Interaktives Lernen
|
||||||
|
|
||||||
|
- [ ] **Persönliche Prüfungs-Checkliste ("Ich kann das!"):**
|
||||||
|
- Interaktive Checkboxen auf den Kyu-Seiten (9. bis 1. Kyu).
|
||||||
|
- Speichert den individuellen Fortschritt lokal im Browser (`localStorage`), ohne die Datenbank zu belasten.
|
||||||
|
- Zeigt einen prozentualen Fortschrittsbalken ("75 % für 8. Kyu Gelbgurt bereit").
|
||||||
|
- [ ] **Zufallstrainer / Prüfungs-Simulator (Flashcards):**
|
||||||
|
- Button z.B. auf den Kyu-Seiten: "Zufällige Technik abfragen" (zeigt eine Technik wie "Mae-Geri aus Zenkutsu-Dachi"), Karateka führt sie aus, klickt auf "Video-Lösung anzeigen" und vergleicht sich.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📖 Priorität 4: Inhalte & Dojo-Praxis
|
||||||
|
|
||||||
|
- [ ] **Audio-Aussprache im Karate-Wörterbuch:**
|
||||||
|
- Lautsprecher-Icon 🔊 neben japanischen Fachbegriffen (*Hikite*, *Mawashi-Geri*, *Tensho*, *Dojokun*) für korrekte Audio-Aussprache.
|
||||||
|
- [ ] **Kata-Spickzettel (Druckansicht für die Sporttasche):**
|
||||||
|
- Spezielles Print-CSS (`@media print`), das Kata-Abläufe und Prüfungsinhalte kompakt auf 1-2 DIN-A4-Seiten ohne Menüleisten und Footer formatiert.
|
||||||
+4
-3
@@ -5,7 +5,8 @@
|
|||||||
**Runner:** Gitea Actions (`/home/lars/gitea-runner/`), Label `ubuntu-latest`
|
**Runner:** Gitea Actions (`/home/lars/gitea-runner/`), Label `ubuntu-latest`
|
||||||
**Repo (intern):** `http://192.168.2.144:3000/Lars/karatewiki.git`
|
**Repo (intern):** `http://192.168.2.144:3000/Lars/karatewiki.git`
|
||||||
**Repo (extern):** `https://gitea.stommer.de/Lars/karatewiki.git`
|
**Repo (extern):** `https://gitea.stommer.de/Lars/karatewiki.git`
|
||||||
**Strato-Produktivsystem:** `51539426.ssh.w1.strato.hosting` (`/Karate_Wiki_135`, Domain `https://www.gojukai-dojo.de`)
|
**Strato-Produktivsystem (Neu, MediaWiki 1.46.2):** `51539426.ssh.w1.strato.hosting` (`~/Karatewiki`, geteilte Medien in `~/karatewiki-shared/images`, MariaDB 11.8 `dbs16266664` auf `database-5021739551.webspace-host.com`)
|
||||||
|
**Strato-Altsystem (Fallback, MediaWiki 1.35.1):** `51539426.ssh.w1.strato.hosting` (`~/Karate_Wiki_135`, MySQL 5.7 `dbs1754262` auf `rdbms.strato.de`)
|
||||||
|
|
||||||
Unter `/home/lars/docker/` legt der Gitea-Runner auf dem Raspberry Pi 5 diese zwei Verzeichnisse an:
|
Unter `/home/lars/docker/` legt der Gitea-Runner auf dem Raspberry Pi 5 diese zwei Verzeichnisse an:
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ Unter `/home/lars/docker/` legt der Gitea-Runner auf dem Raspberry Pi 5 diese zw
|
|||||||
| **Server-Verzeichnis** | `/home/lars/docker/karatewiki` | `/home/lars/docker/karatewiki-dev` |
|
| **Server-Verzeichnis** | `/home/lars/docker/karatewiki` | `/home/lars/docker/karatewiki-dev` |
|
||||||
| **Web-Port (Pi)** | `3008` (`http://192.168.2.49:3008`) | `3093` (`http://192.168.2.49:3093`) |
|
| **Web-Port (Pi)** | `3008` (`http://192.168.2.49:3008`) | `3093` (`http://192.168.2.49:3093`) |
|
||||||
| **MariaDB 11.8** | nur Compose-Netz, DB `dbs1754262` | nur Compose-Netz, DB `karatewiki_dev` |
|
| **MariaDB 11.8** | nur Compose-Netz, DB `dbs1754262` | nur Compose-Netz, DB `karatewiki_dev` |
|
||||||
| **Images-Volume** | `karatewiki-images` | `dev-karatewiki-images` |
|
| **Images-Volume** | `karatewiki-dev_dev-karatewiki-images` (geteilt, keine Redundanz!) | `dev-karatewiki-images` (4,79 GB, 566 verdrahtete Dateien) |
|
||||||
| **Compose** | `docker-compose.yml` | `docker-compose.dev-env.yml` |
|
| **Compose** | `docker-compose.yml` | `docker-compose.dev-env.yml` |
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -25,7 +26,7 @@ Unter `/home/lars/docker/` legt der Gitea-Runner auf dem Raspberry Pi 5 diese zw
|
|||||||
| Workflow | Trigger | Zweck |
|
| Workflow | Trigger | Zweck |
|
||||||
|----------|---------|--------|
|
|----------|---------|--------|
|
||||||
| `deploy-dev.yml` | Push `develop` | Deploy nach `/home/lars/docker/karatewiki-dev`, Schema-Check/Update, Healthcheck `localhost:3093/api.php` |
|
| `deploy-dev.yml` | Push `develop` | Deploy nach `/home/lars/docker/karatewiki-dev`, Schema-Check/Update, Healthcheck `localhost:3093/api.php` |
|
||||||
| `deploy-prod.yml` | Push `main` | Deploy nach `/home/lars/docker/karatewiki`, Schema-Check/Update, Healthcheck `localhost:3008/api.php` |
|
| `deploy-prod.yml` | Push `main` | Deploy nach `/home/lars/docker/karatewiki` (Pi-Standby) **und** automatisches Deployment von `LocalSettings.php`, `assets/` und `extensions/KarateMedia/` nach Strato (`~/Karatewiki`) |
|
||||||
|
|
||||||
Gearbeitet wird auf `develop`. Ein Push auf `develop` baut automatisch den Development-Container auf dem Raspberry Pi 5 (`http://192.168.2.49:3093`).
|
Gearbeitet wird auf `develop`. Ein Push auf `develop` baut automatisch den Development-Container auf dem Raspberry Pi 5 (`http://192.168.2.49:3093`).
|
||||||
Ein Merge-Commit `develop` → `main` (`git merge --no-ff develop` auf `main`) und anschließender Push von `main` aktualisiert die Production-/Standby-Instanz (`http://192.168.2.49:3008`).
|
Ein Merge-Commit `develop` → `main` (`git merge --no-ff develop` auf `main`) und anschließender Push von `main` aktualisiert die Production-/Standby-Instanz (`http://192.168.2.49:3008`).
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "KarateMedia",
|
"name": "KarateMedia",
|
||||||
"version": "1.0.0",
|
"version": "1.1.0",
|
||||||
"author": [
|
"author": [
|
||||||
"Goju-Kai Dojo"
|
"Goju-Kai Dojo"
|
||||||
],
|
],
|
||||||
"url": "https://www.gojukai-dojo.de",
|
"url": "https://www.gojukai-dojo.de",
|
||||||
"description": "Schlanke, wartungsfreie HTML5-Video- und Audio-Erweiterung fuer das Karate-Wiki (unterstuetzt <html5media> und [[Datei:*.mp4]])",
|
"description": "Schlanke, wartungsfreie HTML5-Video- und Vereins-Erweiterung fuer das Karate-Wiki (unterstuetzt <html5media>, [[Datei:*.mp4]] und die Vereins-Anmeldeseite)",
|
||||||
"license-name": "GPL-2.0-or-later",
|
"license-name": "GPL-2.0-or-later",
|
||||||
"type": "media",
|
"type": "media",
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -15,7 +15,10 @@
|
|||||||
"MediaWiki\\Extension\\KarateMedia\\": "src/"
|
"MediaWiki\\Extension\\KarateMedia\\": "src/"
|
||||||
},
|
},
|
||||||
"Hooks": {
|
"Hooks": {
|
||||||
|
"BeforeInitialize": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onBeforeInitialize",
|
||||||
"ParserFirstCallInit": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onParserFirstCallInit",
|
"ParserFirstCallInit": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onParserFirstCallInit",
|
||||||
|
"ParserPreSaveTransformComplete": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onParserPreSaveTransformComplete",
|
||||||
|
"SidebarBeforeOutput": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onSidebarBeforeOutput",
|
||||||
"BeforePageDisplay": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onBeforePageDisplay"
|
"BeforePageDisplay": "MediaWiki\\Extension\\KarateMedia\\KarateMediaHooks::onBeforePageDisplay"
|
||||||
},
|
},
|
||||||
"MediaHandlers": {
|
"MediaHandlers": {
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,6 +1,46 @@
|
|||||||
( function () {
|
( function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
// 1. Mobiler Menü-Button fuer Smartphones & kleine Tablets
|
||||||
|
function initMobileMenu() {
|
||||||
|
if ( document.body.classList.contains( 'mw-special-Userlogin' ) ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ( document.querySelector( '.km-mobile-menu-btn' ) ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var panel = document.getElementById( 'mw-panel' );
|
||||||
|
if ( !panel ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var btn = document.createElement( 'button' );
|
||||||
|
btn.type = 'button';
|
||||||
|
btn.className = 'km-mobile-menu-btn';
|
||||||
|
btn.innerHTML = '☰ Dojo-Menü';
|
||||||
|
btn.addEventListener( 'click', function ( ev ) {
|
||||||
|
ev.stopPropagation();
|
||||||
|
var isOpen = document.body.classList.toggle( 'km-sidebar-open' );
|
||||||
|
btn.innerHTML = isOpen ? '✕ Schließen' : '☰ Dojo-Menü';
|
||||||
|
} );
|
||||||
|
document.body.appendChild( btn );
|
||||||
|
|
||||||
|
document.addEventListener( 'click', function ( ev ) {
|
||||||
|
if ( document.body.classList.contains( 'km-sidebar-open' ) &&
|
||||||
|
!ev.target.closest( '#mw-panel' ) &&
|
||||||
|
!ev.target.closest( '.km-mobile-menu-btn' ) ) {
|
||||||
|
document.body.classList.remove( 'km-sidebar-open' );
|
||||||
|
btn.innerHTML = '☰ Dojo-Menü';
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( document.readyState === 'loading' ) {
|
||||||
|
document.addEventListener( 'DOMContentLoaded', initMobileMenu );
|
||||||
|
} else {
|
||||||
|
initMobileMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Zeitlupen- & Loop-Steuerung fuer alle Karate-Videos
|
||||||
document.addEventListener( 'click', function ( ev ) {
|
document.addEventListener( 'click', function ( ev ) {
|
||||||
var speedBtn = ev.target.closest( '.km-speed-btn' );
|
var speedBtn = ev.target.closest( '.km-speed-btn' );
|
||||||
if ( speedBtn ) {
|
if ( speedBtn ) {
|
||||||
@@ -26,4 +66,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
// 3. PWA Service Worker Registrierung
|
||||||
|
if ( 'serviceWorker' in navigator && ( window.location.protocol === 'https:' || window.location.hostname === 'localhost' || window.location.hostname === '192.168.2.49' ) ) {
|
||||||
|
window.addEventListener( 'load', function () {
|
||||||
|
navigator.serviceWorker.register( '/sw.js' ).catch( function () {} );
|
||||||
|
} );
|
||||||
|
}
|
||||||
}() );
|
}() );
|
||||||
@@ -2,42 +2,683 @@
|
|||||||
|
|
||||||
namespace MediaWiki\Extension\KarateMedia;
|
namespace MediaWiki\Extension\KarateMedia;
|
||||||
|
|
||||||
use Html;
|
use MediaWiki\Content\TextContent;
|
||||||
|
use MediaWiki\Html\Html;
|
||||||
use MediaWiki\MediaWikiServices;
|
use MediaWiki\MediaWikiServices;
|
||||||
use OutputPage;
|
use MediaWiki\Revision\SlotRecord;
|
||||||
use Parser;
|
use MediaWiki\SpecialPage\SpecialPage;
|
||||||
use PPFrame;
|
use MediaWiki\Title\Title;
|
||||||
use Skin;
|
|
||||||
use Title;
|
|
||||||
|
|
||||||
class KarateMediaHooks {
|
class KarateMediaHooks {
|
||||||
|
|
||||||
|
public const DASHBOARD_CONFIG_PAGE = 'Karate:Dashboard';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registriert das <html5media>-Tag fuer Abwaertskompatibilitaet mit bestehenden Wiki-Seiten.
|
* Falls BeforeInitialize erreicht wird, unangemeldete Besucher ohne Leserecht weiterleiten.
|
||||||
*/
|
*/
|
||||||
public static function onParserFirstCallInit( Parser $parser ): bool {
|
public static function onBeforeInitialize( $title, $unused, $output, $user, $request, $mediaWiki ) {
|
||||||
|
if ( !$title || $user->isRegistered() || $title->isSpecial( 'Userlogin' ) ) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$permManager = MediaWikiServices::getInstance()->getPermissionManager();
|
||||||
|
if ( !$permManager->userCan( 'read', $user, $title ) ) {
|
||||||
|
$loginPage = SpecialPage::getTitleFor( 'Userlogin' );
|
||||||
|
$output->redirect( $loginPage->getLocalURL( [ 'returnto' => $title->getPrefixedDBkey() ] ) );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registriert das <html5media>-Tag fuer Abwaertskompatibilitaet (z.B. in der Vorschau).
|
||||||
|
*/
|
||||||
|
public static function onParserFirstCallInit( $parser ): bool {
|
||||||
$parser->setHook( 'html5media', [ self::class, 'renderHtml5MediaTag' ] );
|
$parser->setHook( 'html5media', [ self::class, 'renderHtml5MediaTag' ] );
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Laedt CSS und JS fuer die Video-Steuerung (z.B. Zeitlupe fuer Kata/Bunkai).
|
* Wandelt <html5media>-Tags beim Speichern einer Wiki-Seite automatisch
|
||||||
|
* in den offiziellen MediaWiki-Standard [[Datei:...|...px]] um.
|
||||||
*/
|
*/
|
||||||
public static function onBeforePageDisplay( OutputPage $out, Skin $skin ): void {
|
public static function onParserPreSaveTransformComplete( $parser, string &$text ): void {
|
||||||
|
if ( stripos( $text, '<html5media' ) === false ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$converted = preg_replace_callback(
|
||||||
|
'/<html5media([^>]*)>(.*?)<\/html5media>/is',
|
||||||
|
static function ( array $m ): string {
|
||||||
|
$attrString = $m[1];
|
||||||
|
$inner = trim( $m[2] );
|
||||||
|
$cleanFile = trim( preg_replace( '/^(file|datei|image|bild)\s*:\s*/i', '', $inner ) );
|
||||||
|
if ( $cleanFile === '' ) {
|
||||||
|
return $m[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
$width = null;
|
||||||
|
$height = null;
|
||||||
|
if ( preg_match( '/\bwidth\s*=\s*["\']?(\d+)["\']?/i', $attrString, $wm ) ) {
|
||||||
|
$width = (int)$wm[1];
|
||||||
|
}
|
||||||
|
if ( preg_match( '/\bheight\s*=\s*["\']?(\d+)["\']?/i', $attrString, $hm ) ) {
|
||||||
|
$height = (int)$hm[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
$sizeParam = '';
|
||||||
|
if ( $width && $height ) {
|
||||||
|
$sizeParam = "|{$width}x{$height}px";
|
||||||
|
} elseif ( $width ) {
|
||||||
|
$sizeParam = "|{$width}px";
|
||||||
|
} elseif ( $height ) {
|
||||||
|
$calcWidth = (int)round( $height * 16 / 9 );
|
||||||
|
$sizeParam = "|{$calcWidth}x{$height}px";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "[[Datei:{$cleanFile}{$sizeParam}]]";
|
||||||
|
},
|
||||||
|
$text
|
||||||
|
);
|
||||||
|
|
||||||
|
if ( $converted !== null ) {
|
||||||
|
$text = $converted;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MediaWiki 1.45+ hat "Spezialseiten" (Special:SpecialPages) und "Datei hochladen" (Special:Upload)
|
||||||
|
* aus dem Standard-TOOLBOX-Block ("Werkzeuge") entfernt. Da das Karate-Wiki eine eigene
|
||||||
|
* MediaWiki:Sidebar nutzt, fuegen wir beide Links hier wieder fest unter "Werkzeuge" ein.
|
||||||
|
*/
|
||||||
|
public static function onSidebarBeforeOutput( $skin, &$sidebar ): void {
|
||||||
|
if ( !$skin->getUser()->isRegistered() ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !isset( $sidebar['TOOLBOX'] ) || !is_array( $sidebar['TOOLBOX'] ) ) {
|
||||||
|
$sidebar['TOOLBOX'] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$existingIds = [];
|
||||||
|
foreach ( $sidebar['TOOLBOX'] as $key => $item ) {
|
||||||
|
$existingIds[$key] = true;
|
||||||
|
if ( isset( $item['id'] ) ) {
|
||||||
|
$existingIds[$item['id']] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !isset( $existingIds['upload'] ) && !isset( $existingIds['t-upload'] ) ) {
|
||||||
|
$sidebar['TOOLBOX']['upload'] = [
|
||||||
|
'id' => 't-upload',
|
||||||
|
'text' => $skin->msg( 'upload' )->text(),
|
||||||
|
'href' => SpecialPage::getTitleFor( 'Upload' )->getLocalURL(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !isset( $existingIds['specialpages'] ) && !isset( $existingIds['t-specialpages'] ) ) {
|
||||||
|
$sidebar['TOOLBOX']['specialpages'] = [
|
||||||
|
'id' => 't-specialpages',
|
||||||
|
'text' => $skin->msg( 'specialpages' )->text(),
|
||||||
|
'href' => SpecialPage::getTitleFor( 'Specialpages' )->getLocalURL(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Laedt CSS und JS fuer die Video-Steuerung, das moderne Dojo-Theme, das Hauptseiten-Dashboard
|
||||||
|
* sowie die gestaltete Vereins-Anmeldeseite.
|
||||||
|
*/
|
||||||
|
public static function onBeforePageDisplay( $out, $skin ): void {
|
||||||
$out->addModules( [ 'ext.karateMedia' ] );
|
$out->addModules( [ 'ext.karateMedia' ] );
|
||||||
|
|
||||||
|
// 1. Skin als responsive kennzeichnen, damit MediaWiki den Standard-Viewport (width=device-width)
|
||||||
|
// akzeptiert und das veraltete Desktop-width=1120 unterlaesst:
|
||||||
|
try {
|
||||||
|
$skinRefl = new \ReflectionClass( $skin );
|
||||||
|
if ( $skinRefl->hasProperty( 'options' ) ) {
|
||||||
|
$optProp = $skinRefl->getProperty( 'options' );
|
||||||
|
$optProp->setAccessible( true );
|
||||||
|
$opts = $optProp->getValue( $skin ) ?: [];
|
||||||
|
$opts['responsive'] = true;
|
||||||
|
$optProp->setValue( $skin, $opts );
|
||||||
|
}
|
||||||
|
} catch ( \Throwable $e ) {
|
||||||
|
$bindSkin = \Closure::bind( function () {
|
||||||
|
$this->options['responsive'] = true;
|
||||||
|
}, $skin, $skin );
|
||||||
|
if ( $bindSkin ) {
|
||||||
|
$bindSkin();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Etwaige alte oder doppelte Viewport-Tags (insbesondere width=1120) aus mMetatags entfernen
|
||||||
|
try {
|
||||||
|
$outRefl = new \ReflectionClass( $out );
|
||||||
|
if ( $outRefl->hasProperty( 'mMetatags' ) ) {
|
||||||
|
$metaProp = $outRefl->getProperty( 'mMetatags' );
|
||||||
|
$metaProp->setAccessible( true );
|
||||||
|
$tags = $metaProp->getValue( $out ) ?: [];
|
||||||
|
$cleaned = [];
|
||||||
|
foreach ( $tags as $t ) {
|
||||||
|
if ( isset( $t[0] ) && strtolower( $t[0] ) === 'viewport' ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$cleaned[] = $t;
|
||||||
|
}
|
||||||
|
$metaProp->setValue( $out, $cleaned );
|
||||||
|
}
|
||||||
|
} catch ( \Throwable $e ) {
|
||||||
|
$bindOut = \Closure::bind( function () {
|
||||||
|
$this->mMetatags = array_values( array_filter(
|
||||||
|
$this->mMetatags,
|
||||||
|
static fn( $t ) => !( isset( $t[0] ) && strtolower( $t[0] ) === 'viewport' )
|
||||||
|
) );
|
||||||
|
}, $out, $out );
|
||||||
|
if ( $bindOut ) {
|
||||||
|
$bindOut();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Garantierter, fluessiger mobiler Viewport fuer alle Smartphones & Tablets
|
||||||
|
$out->addMeta( 'viewport', 'width=device-width, initial-scale=1.0, maximum-scale=5.0' );
|
||||||
|
|
||||||
|
// 4. PWA Web App Manifest, App-Icons & Mobile-Fullscreen-Metatags
|
||||||
|
$pwaHead = implode( "\n", [
|
||||||
|
'<link rel="manifest" href="/manifest.webmanifest">',
|
||||||
|
'<link rel="icon" type="image/svg+xml" href="/resources/assets/icon.svg">',
|
||||||
|
'<link rel="apple-touch-icon" href="/resources/assets/icon.svg">',
|
||||||
|
'<meta name="theme-color" content="#1a1a1a">',
|
||||||
|
'<meta name="apple-mobile-web-app-capable" content="yes">',
|
||||||
|
'<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">',
|
||||||
|
'<meta name="apple-mobile-web-app-title" content="Karate-Wiki">',
|
||||||
|
'<meta name="mobile-web-app-capable" content="yes">'
|
||||||
|
] );
|
||||||
|
$out->addHeadItem( 'karate-pwa-meta', $pwaHead );
|
||||||
|
|
||||||
|
// 5. Client-seitige Absicherung: Falls die Skin nachtraeglich noch width=1120 einfuegt,
|
||||||
|
// wird dies sofort beim Head-Parsing entfernt, bevor der Browser skaliert:
|
||||||
|
$inlineGuard = '<script>(function(){' .
|
||||||
|
'var metas=document.querySelectorAll(\'meta[name="viewport"]\');' .
|
||||||
|
'if(metas.length>1){' .
|
||||||
|
'for(var i=0;i<metas.length;i++){' .
|
||||||
|
'if((metas[i].getAttribute(\'content\')||\'\').indexOf(\'1120\')!==-1){' .
|
||||||
|
'metas[i].remove();' .
|
||||||
|
'}' .
|
||||||
|
'}' .
|
||||||
|
'}' .
|
||||||
|
'})();</script>';
|
||||||
|
$out->addHeadItem( 'karate-viewport-guard', $inlineGuard );
|
||||||
|
|
||||||
|
$title = $out->getTitle();
|
||||||
|
$user = $out->getUser();
|
||||||
|
|
||||||
|
// MediaWiki setzt bei fehlendem Leserecht für Gäste intern Special:Badtitle ("Anmeldung erforderlich").
|
||||||
|
// Wir leiten in diesem Fall sofort per HTTP 302 (und JS-Fallback) auf Spezial:Anmelden weiter:
|
||||||
|
if ( $title && !$user->isRegistered() && $title->isSpecial( 'Badtitle' ) ) {
|
||||||
|
$loginPage = SpecialPage::getTitleFor( 'Userlogin' );
|
||||||
|
$requestedTitle = $out->getRequest()->getVal( 'title', 'Hauptseite' );
|
||||||
|
$loginUrl = $loginPage->getLocalURL( [ 'returnto' => $requestedTitle ] );
|
||||||
|
|
||||||
|
$out->getRequest()->response()->header( 'Location: ' . $loginUrl, true, 302 );
|
||||||
|
$out->addHeadItem(
|
||||||
|
'karate-login-redirect',
|
||||||
|
Html::rawElement( 'script', [], 'window.location.replace(' . json_encode( $loginUrl ) . ');' )
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $title && $title->isSpecial( 'Userlogin' ) ) {
|
||||||
|
global $wgKarateLoginTitle, $wgKarateLoginSubtitle, $wgKarateLoginNotice, $wgKarateAccessRequestUrl;
|
||||||
|
|
||||||
|
$loginTitle = $wgKarateLoginTitle ?? 'Goju-Kai Dojo Heilbronn e.V.';
|
||||||
|
$loginSubtitle = $wgKarateLoginSubtitle ?? 'Internes Vereins-Wiki & Technik-Videothek';
|
||||||
|
$loginNotice = $wgKarateLoginNotice ?? (
|
||||||
|
'Willkommen im Trainings- und Nachschlagewerk unseres Karate-Vereins! ' .
|
||||||
|
'Hier findest du alle Kata-, Bunkai- und Kihon-Lehrvideos, Prüfungsordnungen sowie unser Dojo-Wissen. ' .
|
||||||
|
'Der Zugriff ist geschützt und ausschließlich für aktive Vereinsmitglieder freigeschaltet.'
|
||||||
|
);
|
||||||
|
$accessUrl = $wgKarateAccessRequestUrl ?? 'https://shop.karate.hn/produkt/zugang-zu-vereinseigenem-karatewiki-20';
|
||||||
|
$loginLogoUrl = '/resources/assets/logo-light.svg';
|
||||||
|
|
||||||
|
$headerCard = Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'karate-login-hero' ],
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'karate-login-brand' ],
|
||||||
|
Html::element( 'img', [
|
||||||
|
'src' => $loginLogoUrl,
|
||||||
|
'alt' => $loginTitle,
|
||||||
|
'class' => 'karate-login-logo',
|
||||||
|
] ) .
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'karate-login-headings' ],
|
||||||
|
Html::element( 'h2', [ 'class' => 'karate-login-title' ], $loginTitle ) .
|
||||||
|
Html::element( 'p', [ 'class' => 'karate-login-subtitle' ], $loginSubtitle )
|
||||||
|
)
|
||||||
|
) .
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'karate-login-notice' ],
|
||||||
|
Html::element( 'p', [], $loginNotice ) .
|
||||||
|
Html::rawElement(
|
||||||
|
'p',
|
||||||
|
[ 'class' => 'karate-login-contact' ],
|
||||||
|
'Vereinsmitglieder ohne Zugangsdaten können diese ' .
|
||||||
|
Html::element( 'a', [
|
||||||
|
'href' => $accessUrl,
|
||||||
|
'target' => '_blank',
|
||||||
|
'rel' => 'noopener',
|
||||||
|
], 'hier' ) .
|
||||||
|
' beantragen.'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$footerLinks = Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'karate-login-footer-links' ],
|
||||||
|
Html::element( 'a', [ 'href' => '/index.php?title=Karate:Impressum' ], 'Impressum' ) .
|
||||||
|
Html::element( 'span', [ 'class' => 'karate-login-sep' ], '·' ) .
|
||||||
|
Html::element( 'a', [ 'href' => '/index.php?title=Karate:Datenschutz' ], 'Datenschutz' ) .
|
||||||
|
Html::element( 'span', [ 'class' => 'karate-login-sep' ], '·' ) .
|
||||||
|
Html::element( 'a', [
|
||||||
|
'href' => $accessUrl,
|
||||||
|
'target' => '_blank',
|
||||||
|
'rel' => 'noopener',
|
||||||
|
], 'Zugang beantragen' )
|
||||||
|
);
|
||||||
|
|
||||||
|
$out->prependHTML( $headerCard );
|
||||||
|
$out->addHTML( $footerLinks );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Visuelles Dojo-Dashboard auf der Hauptseite (im Lese-Modus)
|
||||||
|
$action = $out->getRequest()->getVal( 'action', 'view' );
|
||||||
|
if ( $title && $user->isRegistered() && $action === 'view' ) {
|
||||||
|
if ( $title->isMainPage() ) {
|
||||||
|
$out->prependHTML( self::buildMainPageDashboard() );
|
||||||
|
} elseif ( $title->getPrefixedText() === self::DASHBOARD_CONFIG_PAGE ) {
|
||||||
|
$backBanner = Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-config-preview-notice' ],
|
||||||
|
Html::rawElement(
|
||||||
|
'span',
|
||||||
|
[],
|
||||||
|
'<strong>Live-Vorschau des Dashboards:</strong> Unten siehst du den Quelltext dieser Seite. ' .
|
||||||
|
'Klicke oben auf <em>„Bearbeiten“</em>, um Gürtel-Links oder Kacheln anzupassen.'
|
||||||
|
) .
|
||||||
|
Html::element(
|
||||||
|
'a',
|
||||||
|
[ 'href' => self::pageUrl( 'Hauptseite' ), 'class' => 'kd-edit-dashboard-btn' ],
|
||||||
|
'← Zurück zur Hauptseite'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$out->prependHTML( $backBanner . self::buildMainPageDashboard() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Standard-Wikitext fuer die editierbare Konfigurationsseite "Karate:Dashboard".
|
||||||
|
*/
|
||||||
|
public static function getDefaultDashboardWikitext(): string {
|
||||||
|
return <<<'WIKITEXT'
|
||||||
|
<!--
|
||||||
|
=============================================================================
|
||||||
|
KONFIGURATION DES DOJO-DASHBOARDS AUF DER HAUPTSEITE
|
||||||
|
=============================================================================
|
||||||
|
Du kannst diese Seite ganz normal über "Bearbeiten" anpassen!
|
||||||
|
|
||||||
|
1. Abschnitt "== Gürtel ==":
|
||||||
|
Format: * Kyu-Anzeige | Gürtelname | Ziel-Seite im Wiki | Farb-Klasse
|
||||||
|
Verfügbare Farb-Klassen:
|
||||||
|
- belt-9kyu (Weiß-Gelb)
|
||||||
|
- belt-8kyu (Gelb)
|
||||||
|
- belt-7kyu (Orange)
|
||||||
|
- belt-6kyu (Grün)
|
||||||
|
- belt-5kyu (Blau)
|
||||||
|
- belt-4kyu (Blau)
|
||||||
|
- belt-3kyu (Braun)
|
||||||
|
- belt-2kyu (Braun)
|
||||||
|
- belt-1kyu (Braun)
|
||||||
|
- belt-dan (Schwarz)
|
||||||
|
|
||||||
|
2. Abschnitte "== Kachel: ... ==":
|
||||||
|
Überschrift: == Kachel: BADGE | Titel der Kachel | Kurzbeschreibung | Darstellungsart ==
|
||||||
|
Darstellungsart: "list" (normale Linkliste) oder "pills" (kompakte Kata-Buttons)
|
||||||
|
Einträge darunter: * Ziel-Seite im Wiki | Angezeigter Text
|
||||||
|
=============================================================================
|
||||||
|
-->
|
||||||
|
== Gürtel ==
|
||||||
|
* 9. Kyu | Weiß-Gelb | IGKR Prüfungsanforderungen 9. Kyu | belt-9kyu
|
||||||
|
* 8. Kyu | Gelbgurt | IGKR Prüfungsanforderungen 8. Kyu | belt-8kyu
|
||||||
|
* 7. Kyu | Orangegurt | IGKR Prüfungsanforderungen 7. Kyu | belt-7kyu
|
||||||
|
* 6. Kyu | Grüngurt | IGKR Prüfungsanforderungen 6. Kyu | belt-6kyu
|
||||||
|
* 5. Kyu | Blaugurt I | IGKR Prüfungsanforderungen 5. Kyu | belt-5kyu
|
||||||
|
* 4. Kyu | Blaugurt II | IGKR Prüfungsanforderungen 4. Kyu | belt-4kyu
|
||||||
|
* 3. Kyu | Braungurt I | IGKR Prüfungsanforderungen 3. Kyu | belt-3kyu
|
||||||
|
* 2. Kyu | Braungurt II | IGKR Prüfungsanforderungen 2. Kyu | belt-2kyu
|
||||||
|
* 1. Kyu | Braungurt III | IGKR Prüfungsanforderungen 1. Kyu | belt-1kyu
|
||||||
|
|
||||||
|
== Kachel: EINSTEIGER | Neu im Dojo? Hier starten! | Die wichtigsten Grundlagen für deine ersten Trainingswochen im Goju-Kai Dojo. | list ==
|
||||||
|
* Obi binden | Gürtel (Obi) richtig binden
|
||||||
|
* Dojo Rei | Begrüßung & Etikette im Dojo
|
||||||
|
* Dojokun | Dojokun – Unsere Verhaltensregeln
|
||||||
|
* Karate Wörterbuch | Karate-Wörterbuch (Japanisch – Deutsch)
|
||||||
|
* Körperwaffen | Körperwaffen im Goju-Ryu
|
||||||
|
|
||||||
|
== Kachel: FORMEN (KATA) | Kata-Videothek | Alle Schüler- und Meister-Katas mit Lehrvideos und Zeitlupen-Steuerung. | pills ==
|
||||||
|
* Goju-Ryu_Kata | Alle Katas
|
||||||
|
* Taikyoku Jodan | Taikyoku Jodan
|
||||||
|
* Taikyoku Chudan | Taikyoku Chudan
|
||||||
|
* Taikyoku Gedan | Taikyoku Gedan
|
||||||
|
* Gekisai Dai Ichi | Gekisai Dai Ichi
|
||||||
|
* Gekisai Dai Ni | Gekisai Dai Ni
|
||||||
|
* Saifa | Saifa
|
||||||
|
* Seienchin | Seienchin
|
||||||
|
* Sanseru | Sanseru
|
||||||
|
* Seisan | Seisan
|
||||||
|
* Seipai | Seipai
|
||||||
|
* Sanchin | Sanchin
|
||||||
|
* Tensho | Tensho
|
||||||
|
|
||||||
|
== Kachel: GRUNDSCHULE | Kihon & Grundtechniken | Stände, Abwehrblöcke, Fauststöße, Fußtritte und Würfe Schritt für Schritt erklärt. | list ==
|
||||||
|
* Dachi-Waza | Dachi-Waza – Stellungen & Stände
|
||||||
|
* Uke-Waza | Uke-Waza – Abwehr- & Blocktechniken
|
||||||
|
* Zuki-Waza | Zuki-Waza – Fauststoßtechniken
|
||||||
|
* Keri-Waza | Keri-Waza – Fuß- & Tritttechniken
|
||||||
|
* Uchi-Waza | Uchi-Waza – Schlagtechniken
|
||||||
|
* Nage-Waza | Nage-Waza – Wurftechniken & Feger
|
||||||
|
* Kihon-Ido | Kihon-Ido – Grundschule in Bewegung
|
||||||
|
|
||||||
|
== Kachel: PARTNER & PRAXIS | Kumite & Selbstverteidigung | Partnerformen, Bunkai-Anwendungen, Hebeltechniken und realistische Abwehr. | list ==
|
||||||
|
* Kumite | Kumite – Übersicht & Formen
|
||||||
|
* Yakusoku-Kumite | Yakusoku-Kumite (abgesprochener Kampf)
|
||||||
|
* Sedeho Kumite | Sedeho Kumite (Zeitlupen-Kumite)
|
||||||
|
* Selbstverteidigung | Selbstverteidigung (SV-Videos)
|
||||||
|
* Hebeltechniken | Hebeltechniken & Fixierungen
|
||||||
|
* Kakie | Kakie – Klebende Hände
|
||||||
|
|
||||||
|
== Kachel: ATHLETIK & SPIELE | Fitness, Dehnung & Kinder | Übungen für zu Hause und fürs Dojo: Beweglichkeit, Kraft, Reaktion und Koordination. | list ==
|
||||||
|
* Dehnung - Koordination - Lockern | Dehnung, Koordination & Lockern (34 Videos)
|
||||||
|
* Muskelaufbau | Muskelaufbau & Kräftigung
|
||||||
|
* Schnelligkeit und Reaktionzeit | Schnelligkeit, Agilität & Reaktionszeit
|
||||||
|
* Partnerübungen mit Pratze | Partnerübungen mit und ohne Pratze
|
||||||
|
* 5 Tibeter | Die 5 Tibeter & Energieübungen
|
||||||
|
* Kindertraining | Kindertraining & Karatespiele
|
||||||
|
|
||||||
|
== Kachel: DOJO & VIDEOS | Aufzeichnungen & Hintergrund | Mitschnitte aus dem Training, Physik der Karate-Techniken und Geschichte. | list ==
|
||||||
|
* Letzte Trainings | Video-Mitschnitte der letzten Trainings
|
||||||
|
* Training beim Sensei | Training beim Sensei
|
||||||
|
* Technikabläufe physikalisch erkärt | Technikabläufe physikalisch erklärt
|
||||||
|
* Prüfungsordnung des IGKR | Prüfungsordnung (IGKR & DKV)
|
||||||
|
* Geschichte des Karate | Geschichte des Goju-Ryu Karate
|
||||||
|
WIKITEXT;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liest den Wikitext von "Karate:Dashboard" aus der Datenbank (oder nutzt den Standard-Fallback)
|
||||||
|
* und parst daraus die Gürtel-Liste und Themen-Kacheln.
|
||||||
|
*/
|
||||||
|
private static function loadDashboardConfig(): array {
|
||||||
|
$rawText = null;
|
||||||
|
$configTitle = Title::newFromText( self::DASHBOARD_CONFIG_PAGE );
|
||||||
|
if ( $configTitle && $configTitle->exists() ) {
|
||||||
|
$rev = MediaWikiServices::getInstance()->getRevisionLookup()->getRevisionByTitle( $configTitle );
|
||||||
|
if ( $rev ) {
|
||||||
|
$content = $rev->getContent( SlotRecord::MAIN );
|
||||||
|
if ( $content instanceof TextContent ) {
|
||||||
|
$rawText = $content->getText();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $rawText === null || trim( $rawText ) === '' ) {
|
||||||
|
$rawText = self::getDefaultDashboardWikitext();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Entferne HTML-Kommentare
|
||||||
|
$cleanText = preg_replace( '/<!--.*?-->/s', '', $rawText );
|
||||||
|
$lines = preg_split( '/\r?\n/', $cleanText );
|
||||||
|
|
||||||
|
$belts = [];
|
||||||
|
$cards = [];
|
||||||
|
$currentSection = '';
|
||||||
|
$currentCard = null;
|
||||||
|
|
||||||
|
foreach ( $lines as $line ) {
|
||||||
|
$line = trim( $line );
|
||||||
|
if ( $line === '' ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( preg_match( '/^==+\s*Gürtel\s*==+$/iu', $line ) ) {
|
||||||
|
if ( $currentCard !== null ) {
|
||||||
|
$cards[] = $currentCard;
|
||||||
|
$currentCard = null;
|
||||||
|
}
|
||||||
|
$currentSection = 'belts';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( preg_match( '/^==+\s*Kachel\s*:\s*(.+?)\s*==+$/iu', $line, $m ) ) {
|
||||||
|
if ( $currentCard !== null ) {
|
||||||
|
$cards[] = $currentCard;
|
||||||
|
}
|
||||||
|
$parts = array_map( 'trim', explode( '|', $m[1] ) );
|
||||||
|
$style = strtolower( $parts[3] ?? 'list' );
|
||||||
|
$currentCard = [
|
||||||
|
'badge' => $parts[0] ?? 'DOJO',
|
||||||
|
'title' => $parts[1] ?? 'Thema',
|
||||||
|
'desc' => $parts[2] ?? '',
|
||||||
|
'style' => $style === 'pills' ? 'pills' : 'list',
|
||||||
|
'items' => [],
|
||||||
|
];
|
||||||
|
$currentSection = 'card';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( strpos( $line, '*' ) === 0 ) {
|
||||||
|
$itemText = trim( ltrim( $line, '*' ) );
|
||||||
|
$parts = array_map( 'trim', explode( '|', $itemText ) );
|
||||||
|
|
||||||
|
if ( $currentSection === 'belts' && count( $parts ) >= 3 ) {
|
||||||
|
$targetPage = trim( $parts[2], '[] ' );
|
||||||
|
$belts[] = [
|
||||||
|
'kyu' => $parts[0],
|
||||||
|
'name' => $parts[1],
|
||||||
|
'page' => $targetPage,
|
||||||
|
'class' => $parts[3] ?? self::guessBeltClass( $parts[0] ),
|
||||||
|
];
|
||||||
|
} elseif ( $currentSection === 'card' && $currentCard !== null && count( $parts ) >= 1 ) {
|
||||||
|
$targetPage = trim( $parts[0], '[] ' );
|
||||||
|
$label = $parts[1] ?? $targetPage;
|
||||||
|
if ( $targetPage !== '' ) {
|
||||||
|
$currentCard['items'][] = [ $targetPage, $label ];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $currentCard !== null ) {
|
||||||
|
$cards[] = $currentCard;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'belts' => $belts,
|
||||||
|
'cards' => $cards,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function guessBeltClass( string $kyuText ): string {
|
||||||
|
for ( $i = 1; $i <= 9; $i++ ) {
|
||||||
|
if ( strpos( $kyuText, (string)$i ) !== false ) {
|
||||||
|
return "belt-{$i}kyu";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 'belt-dan';
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function pageUrl( string $pageName, array $query = [] ): string {
|
||||||
|
$t = Title::newFromText( $pageName );
|
||||||
|
if ( $t ) {
|
||||||
|
return $t->getLocalURL( $query );
|
||||||
|
}
|
||||||
|
return '/index.php?title=' . rawurlencode( $pageName );
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function buildMainPageDashboard(): string {
|
||||||
|
$config = self::loadDashboardConfig();
|
||||||
|
$belts = $config['belts'];
|
||||||
|
$cards = $config['cards'];
|
||||||
|
|
||||||
|
$beltHtml = '';
|
||||||
|
foreach ( $belts as $b ) {
|
||||||
|
$beltHtml .= Html::rawElement(
|
||||||
|
'a',
|
||||||
|
[
|
||||||
|
'href' => self::pageUrl( $b['page'] ),
|
||||||
|
'class' => 'kd-belt-card ' . $b['class'],
|
||||||
|
],
|
||||||
|
Html::element( 'span', [ 'class' => 'kd-belt-stripe' ], '' ) .
|
||||||
|
Html::rawElement(
|
||||||
|
'span',
|
||||||
|
[ 'class' => 'kd-belt-info' ],
|
||||||
|
Html::element( 'strong', [ 'class' => 'kd-belt-kyu' ], $b['kyu'] ) .
|
||||||
|
Html::element( 'span', [ 'class' => 'kd-belt-name' ], $b['name'] )
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$cardsHtml = '';
|
||||||
|
foreach ( $cards as $idx => $c ) {
|
||||||
|
$accentClass = ( $idx % 2 === 0 ) ? 'kd-card-red' : 'kd-card-dark';
|
||||||
|
$bodyHtml = '';
|
||||||
|
|
||||||
|
if ( $c['style'] === 'pills' ) {
|
||||||
|
$pills = '';
|
||||||
|
foreach ( $c['items'] as $pIdx => $pair ) {
|
||||||
|
$pillClass = $pIdx === 0 ? 'kd-kata-pill kd-kata-pill-all' : 'kd-kata-pill';
|
||||||
|
$pills .= Html::element(
|
||||||
|
'a',
|
||||||
|
[ 'href' => self::pageUrl( $pair[0] ), 'class' => $pillClass ],
|
||||||
|
$pair[1]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$bodyHtml = Html::rawElement( 'div', [ 'class' => 'kd-kata-grid' ], $pills );
|
||||||
|
} else {
|
||||||
|
$li = '';
|
||||||
|
foreach ( $c['items'] as $pair ) {
|
||||||
|
$li .= Html::rawElement(
|
||||||
|
'li',
|
||||||
|
[],
|
||||||
|
Html::element( 'a', [ 'href' => self::pageUrl( $pair[0] ) ], $pair[1] )
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$bodyHtml = Html::rawElement( 'ul', [ 'class' => 'kd-card-list' ], $li );
|
||||||
|
}
|
||||||
|
|
||||||
|
$cardsHtml .= Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-topic-card ' . $accentClass ],
|
||||||
|
Html::element( 'span', [ 'class' => 'kd-card-badge' ], $c['badge'] ) .
|
||||||
|
Html::element( 'h3', [ 'class' => 'kd-card-title' ], $c['title'] ) .
|
||||||
|
Html::element( 'p', [ 'class' => 'kd-card-desc' ], $c['desc'] ) .
|
||||||
|
$bodyHtml
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$editDashboardUrl = self::pageUrl( self::DASHBOARD_CONFIG_PAGE, [ 'action' => 'edit' ] );
|
||||||
|
|
||||||
|
return Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-dashboard' ],
|
||||||
|
// 1. Hero-Banner mit Schnellsuche & Bearbeiten-Link
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-hero' ],
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-hero-top-row' ],
|
||||||
|
Html::element( 'span', [ 'class' => 'kd-hero-kicker' ], 'GOJU-KAI DOJO HEILBRONN E.V.' ) .
|
||||||
|
Html::element(
|
||||||
|
'a',
|
||||||
|
[
|
||||||
|
'href' => $editDashboardUrl,
|
||||||
|
'class' => 'kd-edit-dashboard-btn',
|
||||||
|
'title' => 'Gürtel-Links und Dashboard-Kacheln im Wiki-Editor anpassen',
|
||||||
|
],
|
||||||
|
'✎ Dashboard bearbeiten'
|
||||||
|
)
|
||||||
|
) .
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-hero-content' ],
|
||||||
|
Html::element( 'h2', [ 'class' => 'kd-hero-title' ], 'Dojo-Wissen & Technik-Videothek' ) .
|
||||||
|
Html::element(
|
||||||
|
'p',
|
||||||
|
[ 'class' => 'kd-hero-subtitle' ],
|
||||||
|
'Wähle unten deinen nächsten Gürtelgrad (Kyu), starte mit dem Einsteiger-Guide oder suche direkt nach einer Kata oder Technik:'
|
||||||
|
) .
|
||||||
|
Html::rawElement(
|
||||||
|
'form',
|
||||||
|
[ 'action' => '/index.php', 'method' => 'get', 'class' => 'kd-hero-search' ],
|
||||||
|
Html::element( 'input', [ 'type' => 'hidden', 'name' => 'title', 'value' => 'Spezial:Suche' ] ) .
|
||||||
|
Html::element( 'input', [
|
||||||
|
'type' => 'search',
|
||||||
|
'name' => 'search',
|
||||||
|
'placeholder' => 'Technik, Kata oder Begriff suchen (z. B. Seienchin, Mawashi-Geri, Dojokun) …',
|
||||||
|
'class' => 'kd-hero-search-input',
|
||||||
|
] ) .
|
||||||
|
Html::element( 'button', [ 'type' => 'submit', 'class' => 'kd-hero-search-btn' ], 'Suchen' )
|
||||||
|
)
|
||||||
|
)
|
||||||
|
) .
|
||||||
|
// 2. Gürtel-Wegweiser (Kyu-Prüfungsanforderungen)
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-belt-section' ],
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-section-header' ],
|
||||||
|
Html::element( 'h3', [ 'class' => 'kd-section-title' ], 'Dein Weg zum nächsten Gürtel – Prüfungsprogramm (IGKR)' ) .
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-section-links' ],
|
||||||
|
Html::element( 'a', [ 'href' => self::pageUrl( 'Prüfungsordnung des IGKR' ) ], 'IGKR-Ordnung' ) .
|
||||||
|
' · ' .
|
||||||
|
Html::element( 'a', [ 'href' => self::pageUrl( 'Prüfungsordnung des DKV' ) ], 'DKV-Ordnung' ) .
|
||||||
|
' · ' .
|
||||||
|
Html::element( 'a', [ 'href' => $editDashboardUrl ], '✎ Gürtel-Links anpassen' )
|
||||||
|
)
|
||||||
|
) .
|
||||||
|
Html::rawElement( 'div', [ 'class' => 'kd-belt-grid' ], $beltHtml )
|
||||||
|
) .
|
||||||
|
// 3. Themen-Kacheln
|
||||||
|
Html::rawElement( 'div', [ 'class' => 'kd-cards-grid' ], $cardsHtml ) .
|
||||||
|
// 4. Hinweis-Trenner zum klassischen Nachschlagewerk darunter
|
||||||
|
Html::rawElement(
|
||||||
|
'div',
|
||||||
|
[ 'class' => 'kd-classic-divider' ],
|
||||||
|
Html::element( 'span', [], 'Vollständiges Inhaltsverzeichnis & Hintergrundwissen' )
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rendert <html5media height="200" width="300">File:Beispiel.mp4</html5media>
|
* Rendert <html5media height="200" width="300">File:Beispiel.mp4</html5media>
|
||||||
*/
|
*/
|
||||||
public static function renderHtml5MediaTag( ?string $input, array $args, Parser $parser, PPFrame $frame ): string {
|
public static function renderHtml5MediaTag( ?string $input, array $args, $parser, $frame ): string {
|
||||||
if ( $input === null || trim( $input ) === '' ) {
|
if ( $input === null || trim( $input ) === '' ) {
|
||||||
return Html::element( 'span', [ 'class' => 'error' ], 'KarateMedia: Keine Mediendatei angegeben.' );
|
return Html::element( 'span', [ 'class' => 'error' ], 'KarateMedia: Keine Mediendatei angegeben.' );
|
||||||
}
|
}
|
||||||
|
|
||||||
$rawTarget = trim( $input );
|
$rawTarget = trim( $input );
|
||||||
|
|
||||||
// Entferne vorangestelltes "File:" oder "Datei:" falls vorhanden
|
|
||||||
$cleanFileName = preg_replace( '/^(file|datei|image|bild)\s*:\s*/i', '', $rawTarget );
|
$cleanFileName = preg_replace( '/^(file|datei|image|bild)\s*:\s*/i', '', $rawTarget );
|
||||||
|
|
||||||
$services = MediaWikiServices::getInstance();
|
$services = MediaWikiServices::getInstance();
|
||||||
@@ -66,10 +707,10 @@ class KarateMediaHooks {
|
|||||||
];
|
];
|
||||||
|
|
||||||
if ( isset( $args['width'] ) && is_numeric( $args['width'] ) ) {
|
if ( isset( $args['width'] ) && is_numeric( $args['width'] ) ) {
|
||||||
$attrs['width'] = (int)$args['width'];
|
$attrs['width'] = max( 280, (int)$args['width'] );
|
||||||
}
|
}
|
||||||
if ( isset( $args['height'] ) && is_numeric( $args['height'] ) ) {
|
if ( isset( $args['height'] ) && is_numeric( $args['height'] ) ) {
|
||||||
$attrs['height'] = (int)$args['height'];
|
$attrs['height'] = max( 158, (int)$args['height'] );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( in_array( $ext, [ 'mp3', 'ogg' ], true ) && strpos( $file->getMimeType(), 'audio/' ) === 0 ) {
|
if ( in_array( $ext, [ 'mp3', 'ogg' ], true ) && strpos( $file->getMimeType(), 'audio/' ) === 0 ) {
|
||||||
@@ -91,6 +732,7 @@ class KarateMediaHooks {
|
|||||||
$controls = Html::rawElement(
|
$controls = Html::rawElement(
|
||||||
'div',
|
'div',
|
||||||
[ 'class' => 'karate-video-controls', 'title' => 'Abspielgeschwindigkeit fuer Kata/Bunkai-Studium' ],
|
[ 'class' => 'karate-video-controls', 'title' => 'Abspielgeschwindigkeit fuer Kata/Bunkai-Studium' ],
|
||||||
|
Html::element( 'span', [ 'class' => 'km-controls-label' ], 'Tempo:' ) .
|
||||||
Html::element( 'button', [ 'type' => 'button', 'class' => 'km-speed-btn active', 'data-speed' => '1' ], '1x' ) .
|
Html::element( 'button', [ 'type' => 'button', 'class' => 'km-speed-btn active', 'data-speed' => '1' ], '1x' ) .
|
||||||
Html::element( 'button', [ 'type' => 'button', 'class' => 'km-speed-btn', 'data-speed' => '0.5' ], '0.5x' ) .
|
Html::element( 'button', [ 'type' => 'button', 'class' => 'km-speed-btn', 'data-speed' => '0.5' ], '0.5x' ) .
|
||||||
Html::element( 'button', [ 'type' => 'button', 'class' => 'km-speed-btn', 'data-speed' => '0.25' ], '0.25x' ) .
|
Html::element( 'button', [ 'type' => 'button', 'class' => 'km-speed-btn', 'data-speed' => '0.25' ], '0.25x' ) .
|
||||||
|
|||||||
@@ -37,9 +37,20 @@ class KarateVideoHandler extends MediaHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function normaliseParams( $image, &$params ): bool {
|
public function normaliseParams( $image, &$params ): bool {
|
||||||
|
if ( ( !isset( $params['width'] ) || $params['width'] <= 0 ) && isset( $params['height'] ) && $params['height'] > 0 ) {
|
||||||
|
$params['width'] = (int)round( $params['height'] * 16 / 9 );
|
||||||
|
}
|
||||||
if ( !isset( $params['width'] ) || $params['width'] <= 0 ) {
|
if ( !isset( $params['width'] ) || $params['width'] <= 0 ) {
|
||||||
$params['width'] = 320;
|
$params['width'] = 320;
|
||||||
}
|
}
|
||||||
|
// Verhindere briefmarkengrosse 2014er Video-Player (z.B. 150x100px), in denen die Bedienelemente unbenutzbar sind
|
||||||
|
if ( $params['width'] < 280 ) {
|
||||||
|
$ratio = ( isset( $params['height'] ) && $params['height'] > 0 )
|
||||||
|
? ( $params['height'] / $params['width'] )
|
||||||
|
: ( 9 / 16 );
|
||||||
|
$params['width'] = 280;
|
||||||
|
$params['height'] = (int)round( 280 * $ratio );
|
||||||
|
}
|
||||||
if ( !isset( $params['height'] ) || $params['height'] <= 0 ) {
|
if ( !isset( $params['height'] ) || $params['height'] <= 0 ) {
|
||||||
$params['height'] = (int)round( $params['width'] * 9 / 16 );
|
$params['height'] = (int)round( $params['width'] * 9 / 16 );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,180 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Konvertiert alle veralteten <html5media ...>File:...</html5media> Tags
|
||||||
|
* im Wikitext in den offiziellen MediaWiki-Standard [[Datei:...|...px]].
|
||||||
|
*
|
||||||
|
* Aufruf:
|
||||||
|
* php maintenance/run.php scripts/migrate-html5media-tags.php [--dry-run]
|
||||||
|
*/
|
||||||
|
|
||||||
|
use MediaWiki\CommentStore\CommentStoreComment;
|
||||||
|
use MediaWiki\Content\ContentHandler;
|
||||||
|
use MediaWiki\Content\TextContent;
|
||||||
|
use MediaWiki\MediaWikiServices;
|
||||||
|
use MediaWiki\Revision\SlotRecord;
|
||||||
|
use MediaWiki\Title\Title;
|
||||||
|
use MediaWiki\User\User;
|
||||||
|
|
||||||
|
require_once __DIR__ . '/../maintenance/Maintenance.php';
|
||||||
|
|
||||||
|
class MigrateHtml5MediaTags extends Maintenance {
|
||||||
|
|
||||||
|
public function __construct() {
|
||||||
|
parent::__construct();
|
||||||
|
$this->addDescription( 'Ersetzt <html5media>-Tags durch MediaWiki-Standard [[Datei:...]] Syntax.' );
|
||||||
|
$this->addOption( 'dry-run', 'Nur anzeigen, was geaendert wuerde, ohne zu speichern', false, false );
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute() {
|
||||||
|
$dryRun = $this->hasOption( 'dry-run' );
|
||||||
|
$services = MediaWikiServices::getInstance();
|
||||||
|
$dbr = $services->getConnectionProvider()->getReplicaDatabase();
|
||||||
|
$wikiPageFactory = $services->getWikiPageFactory();
|
||||||
|
$revisionLookup = $services->getRevisionLookup();
|
||||||
|
|
||||||
|
$res = $dbr->newSelectQueryBuilder()
|
||||||
|
->select( [ 'page_id', 'page_namespace', 'page_title' ] )
|
||||||
|
->from( 'page' )
|
||||||
|
->orderBy( 'page_id' )
|
||||||
|
->caller( __METHOD__ )
|
||||||
|
->fetchResultSet();
|
||||||
|
|
||||||
|
$systemUser = User::newSystemUser( 'MediaWiki maintenance', [ 'steal' => true ] );
|
||||||
|
$pagesChanged = 0;
|
||||||
|
$tagsReplacedTotal = 0;
|
||||||
|
|
||||||
|
foreach ( $res as $row ) {
|
||||||
|
$title = Title::newFromRow( $row );
|
||||||
|
$rev = $revisionLookup->getRevisionByTitle( $title );
|
||||||
|
if ( !$rev ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$content = $rev->getContent( SlotRecord::MAIN );
|
||||||
|
if ( !$content instanceof TextContent ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$oldText = $content->getText();
|
||||||
|
if ( stripos( $oldText, '<html5media' ) === false ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tagCount = 0;
|
||||||
|
$newText = preg_replace_callback(
|
||||||
|
'/<html5media([^>]*)>(.*?)<\/html5media>/is',
|
||||||
|
function ( array $m ) use ( &$tagCount ): string {
|
||||||
|
$attrString = $m[1];
|
||||||
|
$inner = trim( $m[2] );
|
||||||
|
|
||||||
|
// Entferne vorangestelltes File: / Datei: / Image: / Bild:
|
||||||
|
$cleanFile = preg_replace( '/^(file|datei|image|bild)\s*:\s*/i', '', $inner );
|
||||||
|
$cleanFile = trim( $cleanFile );
|
||||||
|
if ( $cleanFile === '' ) {
|
||||||
|
return $m[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
$width = null;
|
||||||
|
$height = null;
|
||||||
|
if ( preg_match( '/\bwidth\s*=\s*["\']?(\d+)["\']?/i', $attrString, $wm ) ) {
|
||||||
|
$width = (int)$wm[1];
|
||||||
|
}
|
||||||
|
if ( preg_match( '/\bheight\s*=\s*["\']?(\d+)["\']?/i', $attrString, $hm ) ) {
|
||||||
|
$height = (int)$hm[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
$sizeParam = '';
|
||||||
|
if ( $width && $height ) {
|
||||||
|
$sizeParam = "|{$width}x{$height}px";
|
||||||
|
} elseif ( $width ) {
|
||||||
|
$sizeParam = "|{$width}px";
|
||||||
|
} elseif ( $height ) {
|
||||||
|
$calcWidth = (int)round( $height * 16 / 9 );
|
||||||
|
$sizeParam = "|{$calcWidth}x{$height}px";
|
||||||
|
}
|
||||||
|
|
||||||
|
$tagCount++;
|
||||||
|
return "[[Datei:{$cleanFile}{$sizeParam}]]";
|
||||||
|
},
|
||||||
|
$oldText
|
||||||
|
);
|
||||||
|
|
||||||
|
if ( $newText === null || $newText === $oldText || $tagCount === 0 ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$pagesChanged++;
|
||||||
|
$tagsReplacedTotal += $tagCount;
|
||||||
|
|
||||||
|
$this->output( sprintf(
|
||||||
|
"[%s] %s (%d Tag%s)\n",
|
||||||
|
$dryRun ? 'DRY-RUN' : 'UPDATE',
|
||||||
|
$title->getPrefixedText(),
|
||||||
|
$tagCount,
|
||||||
|
$tagCount === 1 ? '' : 's'
|
||||||
|
) );
|
||||||
|
|
||||||
|
if ( !$dryRun ) {
|
||||||
|
$wikiPage = $wikiPageFactory->newFromTitle( $title );
|
||||||
|
$updater = $wikiPage->newPageUpdater( $systemUser );
|
||||||
|
$newContent = ContentHandler::makeContent( $newText, $title );
|
||||||
|
$updater->setContent( SlotRecord::MAIN, $newContent );
|
||||||
|
$comment = CommentStoreComment::newUnsavedComment(
|
||||||
|
'Migration: <html5media> durch MediaWiki-Standard [[Datei:...]] ersetzt'
|
||||||
|
);
|
||||||
|
$updater->saveRevision(
|
||||||
|
$comment,
|
||||||
|
EDIT_UPDATE | EDIT_MINOR | EDIT_FORCE_BOT | EDIT_SUPPRESS_RC
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->output( sprintf(
|
||||||
|
"\nFertig: %d Seiten (%d <html5media>-Tags) %s.\n",
|
||||||
|
$pagesChanged,
|
||||||
|
$tagsReplacedTotal,
|
||||||
|
$dryRun ? 'gefunden (Dry-Run)' : 'erfolgreich auf [[Datei:...]] umgestellt'
|
||||||
|
) );
|
||||||
|
|
||||||
|
// Bereinige zusätzlich den fehlerhaften Tab-Einzug (<pre>-Box) auf der Hauptseite
|
||||||
|
$mainTitle = Title::newFromText( 'Hauptseite' );
|
||||||
|
if ( $mainTitle && !$dryRun ) {
|
||||||
|
$mainRev = $revisionLookup->getRevisionByTitle( $mainTitle );
|
||||||
|
if ( $mainRev ) {
|
||||||
|
$mainContent = $mainRev->getContent( SlotRecord::MAIN );
|
||||||
|
if ( $mainContent instanceof TextContent ) {
|
||||||
|
$mainText = $mainContent->getText();
|
||||||
|
$fixedMain = preg_replace( '/^\s+(Dieses Nachschlagewerk dient)/m', '$1', $mainText );
|
||||||
|
$fixedMain = str_replace( 'http://www.karate-sv-heilbronn.de/', 'https://karate.hn/', $fixedMain );
|
||||||
|
if ( $fixedMain !== $mainText ) {
|
||||||
|
$wp = $wikiPageFactory->newFromTitle( $mainTitle );
|
||||||
|
$up = $wp->newPageUpdater( $systemUser );
|
||||||
|
$up->setContent( SlotRecord::MAIN, ContentHandler::makeContent( $fixedMain, $mainTitle ) );
|
||||||
|
$up->saveRevision(
|
||||||
|
CommentStoreComment::newUnsavedComment( 'Hauptseite: Formatierungsfehler (<pre>-Einzug) & Vereinslink korrigiert' ),
|
||||||
|
EDIT_UPDATE | EDIT_MINOR | EDIT_FORCE_BOT | EDIT_SUPPRESS_RC
|
||||||
|
);
|
||||||
|
$this->output( "[UPDATE] Hauptseite (<pre>-Einzug & Vereinslink korrigiert)\n" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lege die editierbare Konfigurationsseite "Karate:Dashboard" an, falls sie noch nicht existiert
|
||||||
|
$dashTitle = Title::newFromText( \MediaWiki\Extension\KarateMedia\KarateMediaHooks::DASHBOARD_CONFIG_PAGE );
|
||||||
|
if ( $dashTitle && !$dashTitle->exists() && !$dryRun ) {
|
||||||
|
$dashText = \MediaWiki\Extension\KarateMedia\KarateMediaHooks::getDefaultDashboardWikitext();
|
||||||
|
$wpDash = $wikiPageFactory->newFromTitle( $dashTitle );
|
||||||
|
$upDash = $wpDash->newPageUpdater( $systemUser );
|
||||||
|
$upDash->setContent( SlotRecord::MAIN, ContentHandler::makeContent( $dashText, $dashTitle ) );
|
||||||
|
$upDash->saveRevision(
|
||||||
|
CommentStoreComment::newUnsavedComment( 'Initiale Konfigurationsseite für das Dojo-Dashboard angelegt' ),
|
||||||
|
EDIT_NEW | EDIT_MINOR | EDIT_FORCE_BOT | EDIT_SUPPRESS_RC
|
||||||
|
);
|
||||||
|
$this->output( "[CREATE] Karate:Dashboard (Konfigurationsseite angelegt)\n" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$maintClass = MigrateHtml5MediaTags::class;
|
||||||
|
require_once RUN_MAINTENANCE_IF_MAIN;
|
||||||
|
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Wird per SSH (stdin) auf dem Strato-Server ausgefuehrt (100% read-only).
|
||||||
|
* Ermittelt aus der Datenbank alle tatsaechlich in Wiki-Seiten eingebundenen Dateien
|
||||||
|
* (Karate_imagelinks + <html5media>-Tags = 566 Dateien) und streamt exakt diese
|
||||||
|
* als unkomprimiertes tar-Archiv nach stdout.
|
||||||
|
*/
|
||||||
|
|
||||||
|
$c = file_get_contents( 'Karate_Wiki_135/LocalSettings.php' );
|
||||||
|
if ( !preg_match( '/\$wgDBpassword\s*=\s*"([^"]+)"/', $c, $m ) ) {
|
||||||
|
fwrite( STDERR, "Konnte wgDBpassword nicht lesen.\n" );
|
||||||
|
exit( 1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = new mysqli( 'rdbms.strato.de', 'dbu1061679', $m[1], 'dbs1754262' );
|
||||||
|
if ( $db->connect_error ) {
|
||||||
|
fwrite( STDERR, "DB-Verbindungsfehler: {$db->connect_error}\n" );
|
||||||
|
exit( 1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
$usedNames = [];
|
||||||
|
|
||||||
|
// 1. Alle <html5media>-Einbindungen aus den aktuellen Seitentexten sammeln
|
||||||
|
$sqlPages = "
|
||||||
|
SELECT t.old_text
|
||||||
|
FROM Karate_page p
|
||||||
|
JOIN Karate_revision r ON p.page_latest = r.rev_id
|
||||||
|
LEFT JOIN Karate_slots s ON r.rev_id = s.slot_revision_id
|
||||||
|
LEFT JOIN Karate_content co ON s.slot_content_id = co.content_id
|
||||||
|
LEFT JOIN Karate_text t ON CAST(SUBSTRING(co.content_address, 4) AS UNSIGNED) = t.old_id
|
||||||
|
";
|
||||||
|
$res = $db->query( $sqlPages );
|
||||||
|
while ( $row = $res->fetch_assoc() ) {
|
||||||
|
$txt = $row['old_text'] ?? '';
|
||||||
|
if ( preg_match_all( '/<html5media[^>]*>\s*(?:File:|Datei:|Image:|Bild:)?\s*([^<\r\n]+?)\s*<\/html5media>/i', $txt, $matches ) ) {
|
||||||
|
foreach ( $matches[1] as $fn ) {
|
||||||
|
$norm = str_replace( ' ', '_', ucfirst( trim( $fn ) ) );
|
||||||
|
$usedNames[$norm] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Alle [[Datei:...]] / [[File:...]] Einbindungen aus Karate_imagelinks sammeln
|
||||||
|
$resLinks = $db->query( "SELECT DISTINCT il_to FROM Karate_imagelinks" );
|
||||||
|
while ( $row = $resLinks->fetch_assoc() ) {
|
||||||
|
$usedNames[$row['il_to']] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Existierende Dateien im images/-Ordner ueber ihren MediaWiki-MD5-Pfad aufloesen
|
||||||
|
$baseDir = 'Karate_Wiki_135/images';
|
||||||
|
$filesToStream = [];
|
||||||
|
if ( file_exists( "$baseDir/.htaccess" ) ) {
|
||||||
|
$filesToStream[] = '.htaccess';
|
||||||
|
}
|
||||||
|
|
||||||
|
$resImg = $db->query( "SELECT img_name FROM Karate_image" );
|
||||||
|
while ( $row = $resImg->fetch_assoc() ) {
|
||||||
|
$name = $row['img_name'];
|
||||||
|
if ( !isset( $usedNames[$name] ) ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$hash = md5( $name );
|
||||||
|
$relPath = substr( $hash, 0, 1 ) . '/' . substr( $hash, 0, 2 ) . '/' . $name;
|
||||||
|
if ( file_exists( "$baseDir/$relPath" ) ) {
|
||||||
|
$filesToStream[] = $relPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fwrite( STDERR, "Streame " . count( $filesToStream ) . " verdrahtete Mediendateien von Strato...\n" );
|
||||||
|
|
||||||
|
$tmpList = tempnam( sys_get_temp_dir(), 'mw_files_' );
|
||||||
|
file_put_contents( $tmpList, implode( "\n", $filesToStream ) . "\n" );
|
||||||
|
|
||||||
|
$cmd = sprintf( 'tar -cf - -C %s -T %s', escapeshellarg( $baseDir ), escapeshellarg( $tmpList ) );
|
||||||
|
passthru( $cmd, $ret );
|
||||||
|
@unlink( $tmpList );
|
||||||
|
exit( $ret );
|
||||||
|
|
||||||
Reference in new issue
Block a user