From 649d5e9d5213395fe3d1d45ca05f9ef97ae144b1 Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 22 Sep 2024 18:35:52 +0200 Subject: [PATCH] heliohost adjustments --- homepage/cwsvJudo/Makefile | 16 +- .../cwsvJudo/mirror-heliohost-graphics.sh | 7 + .../participo/config-heliohost/.htaccess | 3 + .../participo/config-heliohost/participo.php | 13 + .../cwsvjudo@bplaced/www/config/.htaccess | 3 + .../www/participo/admin.sidenav.inc.php | 6 +- .../www/participo/attendance.php | 19 +- .../www/participo/events.inc.php | 2 - .../www/participo/events.sidenav.inc.php | 6 +- .../www/participo/index.inc.php | 5 +- .../cwsvjudo@bplaced/www/participo/index.php | 16 +- .../www/participo/infoZettel.php | 2 +- .../cwsvjudo@bplaced/www/participo/kyu.php | 2 +- .../www/participo/lib/api.php | 11 +- .../cwsvjudo@bplaced/www/participo/lib/db.php | 29 -- .../participo/lib/participoLib/ageGroup.php | 4 +- .../www/participo/lib/participoLib/event.php | 4 +- .../www/participo/lib/participoLib/shiai.php | 2 +- .../participo/lib/participoLib/starter.php | 2 +- .../www/participo/lib/participoLib/user.php | 9 + .../cwsvjudo@bplaced/www/participo/login.php | 2 +- .../www/participo/phpcount/phpcount.php | 355 ++++++++++++++++++ .../cwsvjudo@bplaced/www/participo/pmelo.php | 2 +- .../www/participo/shared/sidenav.inc.php | 2 +- .../cwsvjudo@bplaced/www/participo/user.php | 22 +- .../lftp.scripts/mirror-heliohost.sh | 7 +- 26 files changed, 461 insertions(+), 90 deletions(-) create mode 100644 homepage/cwsvJudo/mirror-heliohost-graphics.sh create mode 100644 homepage/cwsvJudo/participo/config-heliohost/.htaccess create mode 100644 homepage/cwsvJudo/participo/config-heliohost/participo.php create mode 100644 homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/config/.htaccess create mode 100644 homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/phpcount/phpcount.php diff --git a/homepage/cwsvJudo/Makefile b/homepage/cwsvJudo/Makefile index a2671fb..a78bc21 100644 --- a/homepage/cwsvJudo/Makefile +++ b/homepage/cwsvJudo/Makefile @@ -4,6 +4,8 @@ CSSO = node_modules/csso-cli/bin/csso RES_LIST = 64 128 256 512 +ANDROID_CHROME_ICON_RES_LIST + cssFiles = $(wildcard src/css/*.css) mdFiles = $(wildcard src/md/*.md) phpFiles = $(patsubst src/md/%.md, build/%.php, $(mdFiles)) @@ -162,7 +164,7 @@ build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWa .PHONY: favIcons -favIcons: build/graphiken/favIcons/favicon.ico +favIcons: build/graphiken/favIcons/favicon.ico build/graphiken/favIcons/apple-touch-icon.png build/graphiken/favIcons/favicon.ico: build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png mkdir -p $(dir $@) @@ -173,3 +175,15 @@ build/graphiken/favIcons/favicon.ico: build/graphiken/cwsvJudoLogoWappen/cwsvJud -alpha on \ -define icon:auto-resize=64,48,32,16 \ $@ + +build/graphiken/favIcons/apple-touch-icon.png: build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png + mkdir -p $(dir $@) + convert $< \ + -background transparent \ + -gravity center \ + -resize 180x180 \ + -extent 180x180 \ + $@ + pngquant --speed 1 --ext .png --force $@ + zopflipng -y --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ + diff --git a/homepage/cwsvJudo/mirror-heliohost-graphics.sh b/homepage/cwsvJudo/mirror-heliohost-graphics.sh new file mode 100644 index 0000000..be52c2c --- /dev/null +++ b/homepage/cwsvJudo/mirror-heliohost-graphics.sh @@ -0,0 +1,7 @@ +open cwsvjudo@cwsvjudo.helioho.st +set ssl:verify-certificate no +set ftp:ssl-allow off +mirror --verbose --continue --parallel=8 --reverse ./build/graphiken/cwsvJudoLogoWappen /httpdocs/ressourcen/graphiken/logos +mirror --verbose --continue --parallel=8 --reverse ./build/graphiken/cwsvLogoWappen /httpdocs/ressourcen/graphiken/logos +put -e -O /httpdocs/ ./build/graphiken/favIcons/apple-touch-icon.png +exit diff --git a/homepage/cwsvJudo/participo/config-heliohost/.htaccess b/homepage/cwsvJudo/participo/config-heliohost/.htaccess new file mode 100644 index 0000000..2a42bfb --- /dev/null +++ b/homepage/cwsvJudo/participo/config-heliohost/.htaccess @@ -0,0 +1,3 @@ +order deny,allow +deny from all +allow from localhost diff --git a/homepage/cwsvJudo/participo/config-heliohost/participo.php b/homepage/cwsvJudo/participo/config-heliohost/participo.php new file mode 100644 index 0000000..4188903 --- /dev/null +++ b/homepage/cwsvJudo/participo/config-heliohost/participo.php @@ -0,0 +1,13 @@ +
- cwsvJudo-Apps - + cwsvJudo-Apps + diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php index 773eb87..3a0143c 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php @@ -9,6 +9,7 @@ setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); require_once './lib/db.php'; require_once './lib/api.php'; require_once './lib/participoLib/participo.php'; + require_once './lib/participoLib/user.php'; require_once $config['basePath'] . '/config/cwsvJudo.config.php'; require_once $config['basePath'] . '/config/phpcount.config.php'; @@ -21,7 +22,7 @@ setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); ); participo::authentificate(); - $userData = getUserData(dbConnector::getDbConnection(), $_SESSION['user']['userId']); + $user = participo::sessionUser(); $usersKids = getUsersKids(dbConnector::getDbConnection(), $_SESSION['user']['userId']); abstract class AttendanceType @@ -265,23 +266,23 @@ setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
AdminStuff' . - '
' . + '
' . AppCard::fromArray([ 'title' => 'lastLogins', 'description' => '

' . lastLoginTable() . '

' diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/infoZettel.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/infoZettel.php index 2a2e2bd..3df4d80 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/infoZettel.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/infoZettel.php @@ -62,7 +62,7 @@ $years = array_unique($years);