From 07571b8ca19ad861638d1018b7aaaea3c21f2c76 Mon Sep 17 00:00:00 2001
From: Dominik Frantisek Bucik <bucik@ics.muni.cz>
Date: Tue, 28 Nov 2023 08:29:17 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20More=20fixes=20in=20IsEin?=
 =?UTF-8?q?fraCzEligible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                              | 2 ++
 lib/Auth/Process/IsEinfraCZEligible.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25211b9..9da209d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -716,3 +716,5 @@ ehthumbs_vista.db
 
 # Windows shortcuts
 *.lnk
+
+modules/
diff --git a/lib/Auth/Process/IsEinfraCZEligible.php b/lib/Auth/Process/IsEinfraCZEligible.php
index 342a8d7..d5200c1 100644
--- a/lib/Auth/Process/IsEinfraCZEligible.php
+++ b/lib/Auth/Process/IsEinfraCZEligible.php
@@ -82,7 +82,7 @@ class IsEinfraCZEligible extends ProcessingFilter
         }
         Logger::debug(
             self::LOGGER_PREFIX . 'Result eligibilities attribute: ' .
-            json_encode($request['Attributes'][$this->userEligibilityAttr])
+            json_encode($request['Attributes'][$this->userEligibilityAttr] ?? 'none')
         );
     }
 
@@ -127,7 +127,7 @@ class IsEinfraCZEligible extends ProcessingFilter
                 $data = $this->fetchAffiliationData();
             }
 
-            if (empty($data) and $file_age > strtotime("-" . self::FILE_MAX_AGE_HOURS . " hours")) {
+            if (empty($data) && $file_age > strtotime("-" . self::FILE_MAX_AGE_HOURS . " hours")) {
                 $data = $this->readDataFromCacheFile();
             }
         } else {
-- 
GitLab