From 10bfb9d7ffac585d7ae03b2e0638970443b68f12 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 7 Dec 2015 09:37:29 -0500
Subject: [PATCH] Adjusted CAS/LDAP to match recent Shib improvement. - Don't
require non-empty catalog password (some ILS systems don't need a password).
---
module/VuFind/src/VuFind/Auth/CAS.php | 3 ++-
module/VuFind/src/VuFind/Auth/LDAP.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/module/VuFind/src/VuFind/Auth/CAS.php b/module/VuFind/src/VuFind/Auth/CAS.php
index cc3d2da81b8..eef3d2fd442 100644
--- a/module/VuFind/src/VuFind/Auth/CAS.php
+++ b/module/VuFind/src/VuFind/Auth/CAS.php
@@ -140,6 +140,7 @@ class CAS extends AbstractBase
"cat_username", "cat_password", "email", "lastname", "firstname",
"college", "major", "home_library"
];
+ $catPassword = null;
foreach ($attribsToCheck as $attribute) {
if (isset($cas->$attribute)) {
$value = $casauth->getAttribute($cas->$attribute);
@@ -152,7 +153,7 @@ class CAS extends AbstractBase
}
// Save credentials if applicable:
- if (!empty($catPassword) && !empty($user->cat_username)) {
+ if (!empty($user->cat_username)) {
$user->saveCredentials($user->cat_username, $catPassword);
}
diff --git a/module/VuFind/src/VuFind/Auth/LDAP.php b/module/VuFind/src/VuFind/Auth/LDAP.php
index c80c4fced3e..9bfb8683b4d 100644
--- a/module/VuFind/src/VuFind/Auth/LDAP.php
+++ b/module/VuFind/src/VuFind/Auth/LDAP.php
@@ -290,7 +290,7 @@ class LDAP extends AbstractBase
}
// Save credentials if applicable:
- if (!empty($catPassword) && !empty($user->cat_username)) {
+ if (!empty($user->cat_username)) {
$user->saveCredentials($user->cat_username, $catPassword);
}
--
GitLab