From e23dcb711801896088e2ad90d7a8549d2de514b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johana=20Sup=C3=ADkov=C3=A1?= <johana.supikova@seznam.cz>
Date: Tue, 4 Jul 2023 13:09:50 +0200
Subject: [PATCH 1/2] fix: use userId in ban filter
---
lib/Auth/Process/IsBanned.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/Auth/Process/IsBanned.php b/lib/Auth/Process/IsBanned.php
index 1c541ab0..08282ffc 100644
--- a/lib/Auth/Process/IsBanned.php
+++ b/lib/Auth/Process/IsBanned.php
@@ -75,11 +75,12 @@ class IsBanned extends ProcessingFilter
);
}
- if ($this->banExists($user)) {
- Logger::info('perun:IsBanned: user ' . $user . ' is banned, redirecting to configured URL');
+ $userId = $user->getId();
+ if ($this->banExists($userId)) {
+ Logger::info('perun:IsBanned: user ' . $userId . ' is banned, redirecting to configured URL');
HTTP::redirectTrustedURL($this->redirectUrl);
} else {
- Logger::debug('perun:IsBanned: user ' . $user . ' is not banned');
+ Logger::debug('perun:IsBanned: user ' . $userId . ' is not banned');
}
}
--
GitLab
From a1ca6652d136e1d8311bb7c6a772e6863010a7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ou=C5=A1ek?= <brousek@ics.muni.cz>
Date: Mon, 10 Jul 2023 13:19:05 +0200
Subject: [PATCH 2/2] style: prettier
---
www/listOfSps.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/listOfSps.js b/www/listOfSps.js
index 28056f16..d0bf386c 100644
--- a/www/listOfSps.js
+++ b/www/listOfSps.js
@@ -1,6 +1,6 @@
function getTranslation(str) {
return JSON.parse(
- document.getElementById("translations").getAttribute("content")
+ document.getElementById("translations").getAttribute("content"),
)[str];
}
--
GitLab