diff --git a/.gitignore b/.gitignore index 25211b9e4ba315e74839cc002c32187064ebbbd5..9da209db0e9a6cf8764c8bcf94ec743de0aa3ad6 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 342a8d7ad9ebf2879630698e5ad946f9945d7e00..d5200c1a9a5a954e5115e8e93b83139fc79a438e 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 {