From 6fb6ea9983d515101ffa9e186a91373246673182 Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 17 Nov 2024 10:00:40 +0100 Subject: [PATCH] refactoring login form, add logout to the tests --- .../www/participo/api/inc/bootstrap.php | 6 +- .../cwsvjudo@bplaced/www/participo/login.php | 91 ++++++++++--------- .../cwsvjudo@bplaced/www/participo/logout.php | 12 +-- homepage/cwsvJudo/participo/test/test_main.py | 4 +- 4 files changed, 60 insertions(+), 53 deletions(-) diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api/inc/bootstrap.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api/inc/bootstrap.php index 9836fb3..d7d8dea 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api/inc/bootstrap.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api/inc/bootstrap.php @@ -2,14 +2,14 @@ /// @file common settings and includes for the participo api /// - set locale to german setlocale(LC_ALL, "de_DE@euro", "de_DE", "de", "ge"); -/// - extend the include search path for +/// - extend the include search path for: set_include_path(implode( PATH_SEPARATOR, [ get_include_path(), -/// - user defined libs (e.g. participo) +/// - user defined libs (e.g. participo) "../lib", -/// - config files (we reuse the participo-wide configuration) +/// - config files (we reuse the participo-wide configuration) ".." ] )); diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php index d301008..eea6f35 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php @@ -46,53 +46,60 @@ else { - + cwsvJudo Online Apps - + - -

Loginseite der Online-Apps der Judoka des CWSV

- -
-
- Benutzerdaten -
- - /> -
-
- - -
- '); - } ?> - '); - } ?> - - - -
-
-
- + +

Login-Seite der Online-Apps der Judoka des CWSV

+ + + +
+
+
+

Benutzerdaten

+ + +
+ /> + +
+
+ + +
+ '); + } + ?> + + + + + +
Hinweise +
    +
  • Logindaten sollten vom Übungsleiter vergeben worden sein.
    • +
    • Verlorene oder vergessene Logins oder Passwörter können über den Übungsleiter neu vergeben werden.
    +
  • Dieses Projekt ist in mehr oder weniger aktiven Entwicklung. Sollte mal was nicht funktionieren, kann es sein, dass ich gerade daran herum schreibe. Also ruhig zu einem späteren Zeitpunkt noch einmal probieren.
    • +
+
+
-
-
Hinweise - -
- + + + diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/logout.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/logout.php index f6ee446..87b33d9 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/logout.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/logout.php @@ -4,13 +4,13 @@ if (ini_get('session.use_cookies')) { $params = session_get_cookie_params(); setcookie( - session_name(), + $name=session_name(), '', - time() - 42000, - $params['path'], - $params['domain'], - $params['secure"'], - $params['httponly'] + $expires=(time() - 42000), + $path=$params['path'] ?? "", + $domain=$params['domain'] ?? "", + $params['secure"'] ?? false, + $params['httponly'] ?? false ); } session_destroy(); diff --git a/homepage/cwsvJudo/participo/test/test_main.py b/homepage/cwsvJudo/participo/test/test_main.py index 6502e8c..e578a6d 100644 --- a/homepage/cwsvJudo/participo/test/test_main.py +++ b/homepage/cwsvJudo/participo/test/test_main.py @@ -18,7 +18,7 @@ class TestParticipo(unittest.TestCase): participo.login() self.assertTrue(participo.check_login()) - sections = ("events", "infoZettel", "attendance", "user") + sections = ("events", "infoZettel", "attendance", "user", "logout") for section in sections: with self.subTest(msg=f"- {section}"): participo.load_section(section=section) @@ -27,7 +27,7 @@ class TestParticipo(unittest.TestCase): expr=participo.check_for_xdebug_msgs(), msg=f"php errors on section {section}", ) - + if __name__ == "__main__": logging.basicConfig(level=logging.INFO)