diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/admin.inc.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/admin.inc.php index 8cc2610..8d987e3 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/admin.inc.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/admin.inc.php @@ -20,7 +20,7 @@ dbConnector::connect( ); // authentication of the current user -participo::authentificate(); +participo::authenticate(); if (!participo::isUserAdmin()) { header('Location: /participo', true, 301); } diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.add.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.add.php index 5af7aef..027b5d0 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.add.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.add.php @@ -14,7 +14,7 @@ dbConnector::connect( $cwsvJudoConfig['db']['password'] ); -participo::authentificate(); +participo::authenticate(); $eventId = $_POST['eventId'] ?? null; $startingTypeId = $_POST['type'] ?? null; diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.remove.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.remove.php index 6087eae..4373ffe 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.remove.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.starter.remove.php @@ -14,7 +14,7 @@ dbConnector::connect( $cwsvJudoConfig['db']['password'] ); -participo::authentificate(); +participo::authenticate(); $starterId = $_POST['starterId'] ?? null; $returnToUrl = $_POST['returnToUrl'] ?? 'participo/'; diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.user.add.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.user.add.php index 9bb60da..e16d289 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.user.add.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/api.user.add.php @@ -15,7 +15,7 @@ dbConnector::connect( $cwsvJudoConfig['db']['password'] ); -participo::authentificate(); +participo::authenticate(); $loginName = $_POST['loginName'] ?? null; $name = $_POST['name'] ?? null; 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/attendance.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php index 546b4e9..6c17f06 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/attendance.php @@ -21,7 +21,7 @@ setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); $cwsvJudoConfig['db']['password'] ); - participo::authentificate(); + participo::authenticate(); $user = participo::sessionUser(); $usersKids = getUsersKids(dbConnector::getDbConnection(), $_SESSION['user']['userId']); diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/event.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/event.php index 2da7d96..5c2eda5 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/event.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/event.php @@ -6,7 +6,8 @@ require_once 'participoLib/event.php'; // Configs require_once 'config/participo.php'; -require_once $config['basePath'] . '/config/cwsvJudo.config.php'; +// @todo Switch to json saved settings +require_once $config['home'] . '/.local/cwsvJudo.config.php'; participo::init($cwsvJudoConfig); @@ -24,12 +25,12 @@ participo::init($cwsvJudoConfig); - <?php echo($meta['title']); ?> + <?php echo ($meta['title'] ?? "title missing"); ?> + content="" /> - - + + @@ -44,4 +45,4 @@ participo::init($cwsvJudoConfig); - + \ No newline at end of file diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.inc.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.inc.php index df4fb02..f535202 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.inc.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.inc.php @@ -22,7 +22,7 @@ dbConnector::connect( $cwsvJudoConfig["db"]["password"] ); -participo::authentificate(); +participo::authenticate(); $meta = [ "title" => "Event Planer", diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.sidenav.inc.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.sidenav.inc.php index 431bad5..2089fb2 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.sidenav.inc.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/events.sidenav.inc.php @@ -4,7 +4,7 @@ + + 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/cwsvjudo@bplaced/www/participo/user.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/user.php index 3e3db73..079a234 100644 --- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/user.php +++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/user.php @@ -19,7 +19,7 @@ dbConnector::connect( $cwsvJudoConfig['db']['password'] ); -participo::authentificate(); +participo::authenticate(); $user = participo::sessionUser(); $usersKids = getUsersKids(dbConnector::getDbConnection(), $_SESSION['user']['userId']); diff --git a/homepage/cwsvJudo/participo/test/config.toml b/homepage/cwsvJudo/participo/test/config.toml index 4352847..d69499e 100644 --- a/homepage/cwsvJudo/participo/test/config.toml +++ b/homepage/cwsvJudo/participo/test/config.toml @@ -4,3 +4,7 @@ password = "kodokan" [url] home = "http://127.0.0.1/participo" +# home = "http://cwsvjudo.bplaced.net/participo" + +[settings] +headless = true diff --git a/homepage/cwsvJudo/participo/test/helper.py b/homepage/cwsvJudo/participo/test/helper.py index 9166149..e67b843 100644 --- a/homepage/cwsvJudo/participo/test/helper.py +++ b/homepage/cwsvJudo/participo/test/helper.py @@ -14,10 +14,12 @@ class Participo: def __init__(self) -> None: from selenium.webdriver import Firefox, FirefoxOptions - options = FirefoxOptions() - options.add_argument("-headless") - self.config = load_config() + + options = FirefoxOptions() + if self.config["settings"]["headless"]: + options.add_argument("-headless") + self.driver = Firefox(options=options) self.delay = 5 @@ -33,8 +35,20 @@ class Participo: self.driver.get(url=self.config["url"]["home"]) def load_section(self, section: str): + from urllib3.exceptions import ReadTimeoutError + section_url = "/".join((self.config["url"]["home"], section)) - self.driver.get(url=section_url) + try: + self.driver.get(url=section_url) + except ReadTimeoutError as e: + logging.warning( + "\n".join( + ( + f"TimeoutError loading {section} ({e} - {repr(e)})", + f"- Check for missing resources on section/page {section}", + ) + ) + ) def login(self): credentials = self.config["credentials"] diff --git a/homepage/cwsvJudo/participo/test/test_main.py b/homepage/cwsvJudo/participo/test/test_main.py index 6502e8c..052904d 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)